From 269d0864b574b458f0f6d94f096376c913d049d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= Date: Sun, 28 Feb 2016 22:47:44 -0500 Subject: [PATCH] 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 --- pkgs/tools/package-management/nix-prefetch-scripts/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 '';