public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47534 from andrewrk/zig-0.3.0 

zig: 0.2.0 -> 0.3.0
This commit is contained in:
Will Dietz 2018-09-30 00:10:31 -05:00 committed by GitHub
parent 8413f22bb3 f2fe5f7709
commit b5ba81ac28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/compilers/zig/default.nix
View File

@ -1,30 +1,23 @@
{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2 }: { stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.2.0"; version = "0.3.0";
name = "zig-${version}"; name = "zig-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zig-lang"; owner = "ziglang";
repo = "zig"; repo = "zig";
rev = "${version}"; rev = "${version}";
sha256 = "0lym28z9mj6hfiq78x1fsd8y89h8xyfc1jgqyazi1g9r72427n07"; sha256 = "089ywagxjjh7gxv8h8yg7jpmryzjf7n4m5irhdkhp2966d03kyxm";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 ]; buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 zlib ];
cmakeFlags = [ cmakeFlags = [
"-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include"
"-DZIG_LIBC_LIB_DIR=${stdenv.cc.libc}/lib"
"-DCMAKE_BUILD_TYPE=Release" "-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; { meta = with stdenv.lib; {
description = "Programming languaged designed for robustness, optimality, and clarity"; description = "Programming languaged designed for robustness, optimality, and clarity";
homepage = https://ziglang.org/; homepage = https://ziglang.org/;

2
pkgs/top-level/all-packages.nix
View File

@ -12681,7 +12681,7 @@ with pkgs;
zmqpp = callPackage ../development/libraries/zmqpp { }; zmqpp = callPackage ../development/libraries/zmqpp { };
zig = callPackage ../development/compilers/zig { zig = callPackage ../development/compilers/zig {
llvmPackages = llvmPackages_6; llvmPackages = llvmPackages_7;
}; };
zimlib = callPackage ../development/libraries/zimlib { }; zimlib = callPackage ../development/libraries/zimlib { };