summary refs log tree commit diff
path: root/pkgs/development/libraries/nss
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2022-08-19 15:16:13 +0200
committerMartin Weinelt <hexa@darmstadt.ccc.de>2022-08-19 15:16:13 +0200
commit0badc2389af6f730d2acab4cb66554ddab39b57a (patch)
treef928cbfadc3d0d812de30b63cb6bdad0475f6eb1 /pkgs/development/libraries/nss
parentdf214678dcf8444d290e835c6039a48cefed65b9 (diff)
downloadnixpkgs-0badc2389af6f730d2acab4cb66554ddab39b57a.tar
nixpkgs-0badc2389af6f730d2acab4cb66554ddab39b57a.tar.gz
nixpkgs-0badc2389af6f730d2acab4cb66554ddab39b57a.tar.bz2
nixpkgs-0badc2389af6f730d2acab4cb66554ddab39b57a.tar.lz
nixpkgs-0badc2389af6f730d2acab4cb66554ddab39b57a.tar.xz
nixpkgs-0badc2389af6f730d2acab4cb66554ddab39b57a.tar.zst
nixpkgs-0badc2389af6f730d2acab4cb66554ddab39b57a.zip
nss: migrate manual patching into postPatch
Diffstat (limited to 'pkgs/development/libraries/nss')
-rw-r--r--pkgs/development/libraries/nss/generic.nix20
1 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix
index c2d9518c902..e6d2eae2449 100644
--- a/pkgs/development/libraries/nss/generic.nix
+++ b/pkgs/development/libraries/nss/generic.nix
@@ -39,16 +39,6 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ nspr ];
 
-  prePatch = ''
-    patchShebangs nss
-
-    for f in nss/coreconf/config.gypi nss/build.sh nss/coreconf/config.gypi; do
-      substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env"
-    done
-
-    substituteInPlace nss/coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep"
-  '';
-
   patches = [
     # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
     (if (lib.versionOlder version "3.77") then
@@ -61,7 +51,15 @@ stdenv.mkDerivation rec {
 
   patchFlags = [ "-p0" ];
 
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postPatch = ''
+    patchShebangs nss
+
+    for f in nss/coreconf/config.gypi nss/build.sh nss/coreconf/config.gypi; do
+      substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env"
+    done
+
+    substituteInPlace nss/coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep"
+  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
     substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'"
   '';