From f6b91343d829ce43e96669fa083cb9732293274e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 7 Sep 2020 07:19:26 +0200 Subject: utils.bash: also "fix" cc-wrapper and pkg-config-wrapper (cherry picked from commit 1936b11f63d2f58ef0c7216e53e56deb804a715e) --- nixpkgs/pkgs/build-support/cc-wrapper/default.nix | 2 +- nixpkgs/pkgs/build-support/pkg-config-wrapper/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'nixpkgs') 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 '' ## -- cgit 1.4.1