3
0
Fork 0
forked from mirrors/nixpkgs

development/compilers/zig: upgrade to 0.6.0

This commit is contained in:
Christine Dodrill 2020-04-13 18:37:09 -04:00
parent 180ae3d371
commit 841089817d
3 changed files with 38 additions and 6 deletions

View file

@ -1,25 +1,47 @@
{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }:
stdenv.mkDerivation rec {
version = "0.5.0";
llvmPackages.stdenv.mkDerivation rec {
version = "0.6.0";
pname = "zig";
src = fetchFromGitHub {
owner = "ziglang";
repo = pname;
rev = version;
sha256 = "0xyl0riakh6kwb3yvxihb451kqs4ai4q0aygqygnlb2rlr1dn1zb";
sha256 = "13dwm2zpscn4n0p5x8ggs9n7mwmq9cgip383i3qqphg7m3pkls8z";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 zlib ];
buildInputs = [
llvmPackages.clang-unwrapped
llvmPackages.llvm
llvmPackages.lld
libxml2
zlib
];
patches = [ ./llvm10_polly.patch ];
postPatch = ''
export llvm_extras=-Wl,${llvmPackages.llvm}/lib/LLVMPolly.so
substituteAllInPlace CMakeLists.txt
'';
preBuild = ''
export HOME=$TMPDIR;
'';
checkPhase = ''
runHook preCheck
./zig test $src/test/stage1/behavior.zig
runHook postCheck
'';
doCheck = true;
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/";
license = licenses.mit;
platforms = platforms.unix;

View file

@ -0,0 +1,10 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97608cddf..e451c0711 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -369,4 +369,5 @@ target_link_libraries(zig_cpp LINK_PUBLIC
${CLANG_LIBRARIES}
${LLD_LIBRARIES}
${LLVM_LIBRARIES}
+ @llvm_extras@
)

View file

@ -15012,7 +15012,7 @@ in
zmqpp = callPackage ../development/libraries/zmqpp { };
zig = callPackage ../development/compilers/zig {
llvmPackages = llvmPackages_9;
llvmPackages = llvmPackages_10;
};
zimlib = callPackage ../development/libraries/zimlib { };