From 835201e8141f16167ef02ca62335e65d7042a673 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 19 Oct 2017 23:51:45 -0400 Subject: [PATCH] zig: init at 0.1.1 --- pkgs/development/compilers/zig/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/zig/default.nix diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix new file mode 100644 index 000000000000..6f0c6d19e450 --- /dev/null +++ b/pkgs/development/compilers/zig/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, llvmPackages_5, llvm_5 }: + +stdenv.mkDerivation rec { + version = "0.1.1"; + name = "zig-${version}"; + + src = fetchFromGitHub { + owner = "zig-lang"; + repo = "zig"; + rev = "${version}"; + sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06"; + }; + + buildInputs = [ cmake llvmPackages_5.clang-unwrapped llvm_5 ]; + + cmakeFlags = [ + "-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include" + "-DZIG_LIBC_LIB_DIR=${stdenv.cc.libc}/lib" + "-DCMAKE_BUILD_TYPE=Release" + "-DZIG_EACH_LIB_RPATH=On" + ]; + + preConfigure = '' + cmakeFlags="$cmakeFlags -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $(cc -print-file-name=crtbegin.o)) -DZIG_DYNAMIC_LINKER=$(cc -print-file-name=ld-linux-x86-64.so.2)" + ''; + + meta = with stdenv.lib; { + description = "Programming languaged designed for robustness, optimality, and clarity"; + homepage = http://ziglang.org/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.andrewrk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bef03ff8365..0d39ff0d8e02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7717,7 +7717,6 @@ with pkgs; inherit (python3Packages) fetchPypi buildPythonApplication lxml typed-ast; }; - ### DEVELOPMENT / LIBRARIES a52dec = callPackage ../development/libraries/a52dec { }; @@ -11098,6 +11097,8 @@ with pkgs; czmq = czmq3; }; + zig = callPackage ../development/compilers/zig {}; + zimlib = callPackage ../development/libraries/zimlib { }; zita-convolver = callPackage ../development/libraries/audio/zita-convolver { };