diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-09-07 07:19:26 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:28:23 +0000 |
commit | f6b91343d829ce43e96669fa083cb9732293274e (patch) | |
tree | d53386f23c18e43f4885fe1ace617826f2325094 /nixpkgs | |
parent | bc030c028322c3797c351832ff2e41348351a223 (diff) | |
download | nixlib-f6b91343d829ce43e96669fa083cb9732293274e.tar nixlib-f6b91343d829ce43e96669fa083cb9732293274e.tar.gz nixlib-f6b91343d829ce43e96669fa083cb9732293274e.tar.bz2 nixlib-f6b91343d829ce43e96669fa083cb9732293274e.tar.lz nixlib-f6b91343d829ce43e96669fa083cb9732293274e.tar.xz nixlib-f6b91343d829ce43e96669fa083cb9732293274e.tar.zst nixlib-f6b91343d829ce43e96669fa083cb9732293274e.zip |
utils.bash: also "fix" cc-wrapper and pkg-config-wrapper
(cherry picked from commit 1936b11f63d2f58ef0c7216e53e56deb804a715e)
Diffstat (limited to 'nixpkgs')
-rw-r--r-- | nixpkgs/pkgs/build-support/cc-wrapper/default.nix | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/build-support/pkg-config-wrapper/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index bfb15f2f7836..fff57dd7c48f 100644 --- a/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix @@ -453,7 +453,7 @@ stdenv.mkDerivation { substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh - substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash + substituteAll ${if stdenv.isDarwin then ../wrapper-common/utils.bash.darwin else ../wrapper-common/utils.bash} $out/nix-support/utils.bash '' ## diff --git a/nixpkgs/pkgs/build-support/pkg-config-wrapper/default.nix b/nixpkgs/pkgs/build-support/pkg-config-wrapper/default.nix index e01df107dd17..b1b9325ea6e5 100644 --- a/nixpkgs/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/nixpkgs/pkgs/build-support/pkg-config-wrapper/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation { + '' substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh - substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash + substituteAll ${if stdenv.isDarwin then ../wrapper-common/utils.bash.darwin else ../wrapper-common/utils.bash} $out/nix-support/utils.bash '' ## |