diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-09-07 16:31:59 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:28:26 +0000 |
| commit | 14edacb6e7fa59c813c7ef7a531735eee74aef6f (patch) | |
| tree | 1338ec7ecc4c5d9941b419b1b83fe164e261f1b9 /nixpkgs/pkgs/build-support/cc-wrapper | |
| parent | f6b91343d829ce43e96669fa083cb9732293274e (diff) | |
| download | nixlib-14edacb6e7fa59c813c7ef7a531735eee74aef6f.tar nixlib-14edacb6e7fa59c813c7ef7a531735eee74aef6f.tar.gz nixlib-14edacb6e7fa59c813c7ef7a531735eee74aef6f.tar.bz2 nixlib-14edacb6e7fa59c813c7ef7a531735eee74aef6f.tar.lz nixlib-14edacb6e7fa59c813c7ef7a531735eee74aef6f.tar.xz nixlib-14edacb6e7fa59c813c7ef7a531735eee74aef6f.tar.zst nixlib-14edacb6e7fa59c813c7ef7a531735eee74aef6f.zip | |
Revert "utils.bash: also "fix" cc-wrapper and pkg-config-wrapper"
Follow up to the revert in e560459c5b06ce1351ae5eb8988f8ce87602058a. This reverts commit 1936b11f63d2f58ef0c7216e53e56deb804a715e. (cherry picked from commit 5ceea5705a1c3346d17ee44728ed442699f48863)
Diffstat (limited to 'nixpkgs/pkgs/build-support/cc-wrapper')
| -rw-r--r-- | nixpkgs/pkgs/build-support/cc-wrapper/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index fff57dd7c48f..bfb15f2f7836 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 ${if stdenv.isDarwin then ../wrapper-common/utils.bash.darwin else ../wrapper-common/utils.bash} $out/nix-support/utils.bash + substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash '' ## |