about summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorValérian Galliat <val@codejam.info>2016-02-28 22:47:44 -0500
committerValérian Galliat <val@codejam.info>2016-02-29 18:38:59 -0500
commit269d0864b574b458f0f6d94f096376c913d049d1 (patch)
tree6e8d87f249bf1f7d764ecd6ae800e53c65309200 /pkgs/tools/package-management
parentae2ad0dfc155833faf3cf922ca73b61c4404193e (diff)
downloadnixlib-269d0864b574b458f0f6d94f096376c913d049d1.tar
nixlib-269d0864b574b458f0f6d94f096376c913d049d1.tar.gz
nixlib-269d0864b574b458f0f6d94f096376c913d049d1.tar.bz2
nixlib-269d0864b574b458f0f6d94f096376c913d049d1.tar.lz
nixlib-269d0864b574b458f0f6d94f096376c913d049d1.tar.xz
nixlib-269d0864b574b458f0f6d94f096376c913d049d1.tar.zst
nixlib-269d0864b574b458f0f6d94f096376c913d049d1.zip
nix-prefetch-scripts: explicitly depend on Nix
Otherwise, a call to, for example, nix-prefetch-git, in a nix-shell --pure or
nix-build phase would result in an error such as:

    Switched to a new branch 'fetchgit'
    removing `.git'...
    /nix/store/7qvjji7kbd033nsyxlpiiiam61a44yz9-nix-prefetch-git/bin/.nix-prefetch-git-wrapped: line 374: nix-hash: command not found
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
     '';