summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-03-05 18:55:30 +0100
committerFranz Pletz <fpletz@fnordicwalking.de>2016-03-05 18:55:30 +0100
commitcb3d27df93d54dd913aa3348c996f4ed372d1c20 (patch)
tree602c0f0c643f88699117f5191b2c9a805d77a65b /pkgs/tools/package-management
parentaff1f4ab948b921ceaf2b81610f2f82454302b4b (diff)
parent4e8853ca8d46988d283bc06a4c7cd6cf68a25576 (diff)
downloadnixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar
nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar.gz
nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar.bz2
nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar.lz
nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar.xz
nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar.zst
nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.zip
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/nix-prefetch-scripts/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index 5b98bcbbe12b..e70659aff00f 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -1,5 +1,5 @@
 { stdenv, makeWrapper, buildEnv,
-  git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused, coreutils
+  git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused, coreutils, nix
 }:
 
 let mkPrefetchScript = tool: src: deps:
@@ -18,6 +18,7 @@ let mkPrefetchScript = tool: src: deps:
         wrapArgs="$wrapArgs --prefix PATH : $dep/bin"
       done
       wrapArgs="$wrapArgs --prefix PATH : ${gnused}/bin"
+      wrapArgs="$wrapArgs --prefix PATH : ${nix}/bin" # For nix-hash
       wrapArgs="$wrapArgs --set HOME : /homeless-shelter"
       wrapProgram $out/bin/$name $wrapArgs
     '';