diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-09-07 16:31:59 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-09-07 16:31:59 +0200 |
| commit | 5ceea5705a1c3346d17ee44728ed442699f48863 (patch) | |
| tree | c6bee7cbb220758a2b79b78c45391cd3dc1f62ac | |
| parent | be61518b91d4d17625f9fc1b4e91f17e3ee355e7 (diff) | |
| download | nixpkgs-5ceea5705a1c3346d17ee44728ed442699f48863.tar nixpkgs-5ceea5705a1c3346d17ee44728ed442699f48863.tar.gz nixpkgs-5ceea5705a1c3346d17ee44728ed442699f48863.tar.bz2 nixpkgs-5ceea5705a1c3346d17ee44728ed442699f48863.tar.lz nixpkgs-5ceea5705a1c3346d17ee44728ed442699f48863.tar.xz nixpkgs-5ceea5705a1c3346d17ee44728ed442699f48863.tar.zst nixpkgs-5ceea5705a1c3346d17ee44728ed442699f48863.zip | |
Revert "utils.bash: also "fix" cc-wrapper and pkg-config-wrapper"
Follow up to the revert in e560459c5b06ce1351ae5eb8988f8ce87602058a. This reverts commit 1936b11f63d2f58ef0c7216e53e56deb804a715e.
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/pkg-config-wrapper/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index fff57dd7c48..bfb15f2f783 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/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 '' ## diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index b1b9325ea6e..e01df107dd1 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/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 ${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 '' ## |