3 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh
index f65b792485a0..2cf606cce7c9 100644
--- a/pkgs/build-support/bintools-wrapper/setup-hook.sh
+++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh
@@ -59,11 +59,11 @@ for cmd in \
     ar as ld nm objcopy objdump readelf ranlib strip strings size windres
 do
     if
-        PATH=$_PATH type -p "@targetPrefix@${cmd}" > /dev/null
+        cmd_path=$(PATH=$_PATH command -v "@targetPrefix@${cmd}")
     then
         upper_case="$(echo "$cmd" | tr "[:lower:]" "[:upper:]")"
-        export "${role_pre}${upper_case}=@targetPrefix@${cmd}";
-        export "${upper_case}${role_post}=@targetPrefix@${cmd}";
+        export "${role_pre}${upper_case}=${cmd_path}";
+        export "${upper_case}${role_post}=${cmd_path}";
     fi
 done
 
@@ -72,5 +72,5 @@ done
 export NIX_HARDENING_ENABLE
 
 # No local scope in sourced file
-unset -v role_pre role_post cmd upper_case
+unset -v role_pre role_post cmd cmd_path upper_case
 set +u
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index 28060de74118..619e75a39748 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -109,10 +109,10 @@ fi
 
 export NIX_${role_pre}CC=@out@
 
-export ${role_pre}CC=@named_cc@
-export ${role_pre}CXX=@named_cxx@
-export CC${role_post}=@named_cc@
-export CXX${role_post}=@named_cxx@
+export ${role_pre}CC=@out@/bin/@named_cc@
+export ${role_pre}CXX=@out@/bin/@named_cxx@
+export CC${role_post}=@out@/bin/@named_cc@
+export CXX${role_post}=@out@/bin/@named_cxx@
 
 # If unset, assume the default hardening flags.
 : ${NIX_HARDENING_ENABLE="fortify stackprotector pic strictoverflow format relro bindnow"}
diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix
index f691b1bf7356..dad65a0e7eb3 100644
--- a/pkgs/build-support/release/binary-tarball.nix
+++ b/pkgs/build-support/release/binary-tarball.nix
@@ -27,11 +27,11 @@ stdenv.mkDerivation (
     postPhases = "finalPhase";
   }
 
-  // args // 
+  // args //
 
   {
     name = name + (if src ? version then "-" + src.version else "");
-  
+
     postHook = ''
       mkdir -p $out/nix-support
       echo "$system" > $out/nix-support/system
@@ -43,7 +43,7 @@ stdenv.mkDerivation (
       if test -e $origSrc/nix-support/hydra-release-name; then
           releaseName=$(cat $origSrc/nix-support/hydra-release-name)
       fi
-      
+
       installFlagsArray=(DESTDIR=$TMPDIR/inst)
 
       # Prefix hackery because of a bug in stdenv (it tries to `mkdir
@@ -62,18 +62,18 @@ stdenv.mkDerivation (
         tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst .
       '';
 
-                
+
     finalPhase =
       ''
         for i in $out/tarballs/*; do
             echo "file binary-dist $i" >> $out/nix-support/hydra-build-products
         done
-        
+
         # Propagate the release name of the source tarball.  This is
         # to get nice package names in channels.
         test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name)
       '';
-    
+
 
     meta = (if args ? meta then args.meta else {}) // {
       description = "Build of a generic binary distribution";