diff options
| author | Christine Dodrill <me@christine.website> | 2020-04-13 18:55:57 -0400 |
|---|---|---|
| committer | Christine Dodrill <me@christine.website> | 2020-04-13 18:56:41 -0400 |
| commit | 24b3158efca85b551cf86b48320d231466c4f594 (patch) | |
| tree | a9044b123a56b42caa075ada511921c29c9422a4 /pkgs/development/compilers | |
| parent | f94bd953685a4a4e9cbf87306dd171b3a5ed01bf (diff) | |
| download | nixlib-24b3158efca85b551cf86b48320d231466c4f594.tar nixlib-24b3158efca85b551cf86b48320d231466c4f594.tar.gz nixlib-24b3158efca85b551cf86b48320d231466c4f594.tar.bz2 nixlib-24b3158efca85b551cf86b48320d231466c4f594.tar.lz nixlib-24b3158efca85b551cf86b48320d231466c4f594.tar.xz nixlib-24b3158efca85b551cf86b48320d231466c4f594.tar.zst nixlib-24b3158efca85b551cf86b48320d231466c4f594.zip | |
zig: apply suggestion from @cole-h
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/zig/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index d88314e21804..20ce0b5ff5ee 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }: +{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }: llvmPackages.stdenv.mkDerivation rec { version = "0.6.0"; @@ -20,12 +20,12 @@ llvmPackages.stdenv.mkDerivation rec { zlib ]; - patches = [ ./llvm10_polly.patch ]; - - postPatch = '' - export llvm_extras=-Wl,${llvmPackages.llvm}/lib/LLVMPolly.so - substituteAllInPlace CMakeLists.txt - ''; + patches = [ + (substituteAll { + src = ./llvm10_polly.patch; + llvm_extras = "-Wl,${llvmPackages.llvm}/lib/LLVMPolly.so"; + }) + ]; preBuild = '' export HOME=$TMPDIR; |