diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-09-29 15:18:57 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-09-29 15:18:57 -0400 |
| commit | f2fe5f77093cf879cff892cb89203b994990c08e (patch) | |
| tree | 5cdaea4b2b3f2154cc40fb0529fc1ff94bf6e762 /pkgs | |
| parent | 21c26ca3907dd0d4599440cdfb5bcb1062179bec (diff) | |
| download | nixlib-f2fe5f77093cf879cff892cb89203b994990c08e.tar nixlib-f2fe5f77093cf879cff892cb89203b994990c08e.tar.gz nixlib-f2fe5f77093cf879cff892cb89203b994990c08e.tar.bz2 nixlib-f2fe5f77093cf879cff892cb89203b994990c08e.tar.lz nixlib-f2fe5f77093cf879cff892cb89203b994990c08e.tar.xz nixlib-f2fe5f77093cf879cff892cb89203b994990c08e.tar.zst nixlib-f2fe5f77093cf879cff892cb89203b994990c08e.zip | |
zig: 0.2.0 -> 0.3.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/zig/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index 44d1f7bfe4a2..fd95635616fc 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,30 +1,23 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2 }: +{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }: stdenv.mkDerivation rec { - version = "0.2.0"; + version = "0.3.0"; name = "zig-${version}"; src = fetchFromGitHub { - owner = "zig-lang"; + owner = "ziglang"; repo = "zig"; rev = "${version}"; - sha256 = "0lym28z9mj6hfiq78x1fsd8y89h8xyfc1jgqyazi1g9r72427n07"; + sha256 = "089ywagxjjh7gxv8h8yg7jpmryzjf7n4m5irhdkhp2966d03kyxm"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 ]; + buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 zlib ]; 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 = https://ziglang.org/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8460da60e9d..cc8c741fd733 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12679,7 +12679,7 @@ with pkgs; zmqpp = callPackage ../development/libraries/zmqpp { }; zig = callPackage ../development/compilers/zig { - llvmPackages = llvmPackages_6; + llvmPackages = llvmPackages_7; }; zimlib = callPackage ../development/libraries/zimlib { }; |