From f89a136fd508c88a4f5aa7332e380603a802eb5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 1 Feb 2016 14:42:33 +0100 Subject: [PATCH] cc-wrapper: fixup branch interactions c0599fdd61c and changes on closure-size didn't go well together. --- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 4 ++-- pkgs/build-support/cc-wrapper/default.nix | 2 +- pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 4 ++-- pkgs/build-support/cc-wrapper/ld-wrapper.sh | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 6e12a0d8bc8..99cee577cd3 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -1,7 +1,7 @@ #! @shell@ -e path_backup="$PATH" -if [ -n "@coreutils@" ]; then - PATH="@coreutils@/bin:@gnugrep@/bin" +if [ -n "@coreutils_bin@" ]; then + PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" fi if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 0458eedc62b..6cdd0477244 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { preferLocalBuild = true; inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin; - gnugrep = if nativeTools then "" else gnugrep; + gnugrep_bin = if nativeTools then "" else gnugrep; passthru = { inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; }; diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index ae46b40ac63..06858da512a 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -1,7 +1,7 @@ #! @shell@ -e path_backup="$PATH" -if [ -n "@coreutils@" ]; then - PATH="@coreutils@/bin" +if [ -n "@coreutils_bin@" ]; then + PATH="@coreutils_bin@/bin" fi if [ -n "$NIX_GNAT_WRAPPER_START_HOOK" ]; then diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index 6ef06eb7034..955b3767a62 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -1,7 +1,7 @@ #! @shell@ -e path_backup="$PATH" -if [ -n "@coreutils@" ]; then - PATH="@coreutils@/bin" +if [ -n "@coreutils_bin@" ]; then + PATH="@coreutils_bin@/bin" fi if [ -n "$NIX_LD_WRAPPER_START_HOOK" ]; then