Revert "utils.bash: also "fix" cc-wrapper and pkg-config-wrapper"

Follow up to the revert in e560459c5b. This reverts commit 1936b11f63.
4 years ago · 5ceea5705a
parent be61518b91
commit 5ceea5705a
2 changed files with 2 additions and 2 deletions
--- 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
    ''

    ##
--- 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
    ''

    ##