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

Follow up to the revert in e560459.

This reverts commit 1936b11.

Author: FRidh

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

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