zig: apply suggestion from @cole-h

NixOS · Apr 13, 2020 · 24b3158 · 24b3158
1 parent f94bd95
commit 24b3158
Showing 1 changed file with 7 additions and 7 deletions.
diff --git 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;