604ca29bf0
* nix-0.10pre5896-paths.patch :: this path adds coreutils to the searchpath, so nix-prefetch-url can find "basename" * nix-0.10pre5896-chroot-once.patch :: unsets NIX_ROOT in various scripts, to prevent that when NIX_ROOT is set and one of the nix tools is called that chroot() is performed once more svn path=/nixpkgs/trunk/; revision=6023
29 lines
991 B
Diff
29 lines
991 B
Diff
diff -rc nix-0.10pre5896/scripts/download-using-manifests.pl.in nix-0.10pre5896.new/scripts/download-using-manifests.pl.in
|
|
*** nix-0.10pre5896/scripts/download-using-manifests.pl.in 2006-07-24 20:39:47.000000000 +0200
|
|
--- nix-0.10pre5896.new/scripts/download-using-manifests.pl.in 2006-08-02 21:45:53.000000000 +0200
|
|
***************
|
|
*** 9,14 ****
|
|
--- 9,15 ----
|
|
|
|
open LOGFILE, ">>$logFile" or die "cannot open log file $logFile";
|
|
|
|
+ delete $ENV{"NIX_ROOT"};
|
|
|
|
# Create a temporary directory.
|
|
my $tmpDir;
|
|
diff -rc nix-0.10pre5896/scripts/nix-prefetch-url.in nix-0.10pre5896.new/scripts/nix-prefetch-url.in
|
|
*** nix-0.10pre5896/scripts/nix-prefetch-url.in 2006-07-24 20:39:47.000000000 +0200
|
|
--- nix-0.10pre5896.new/scripts/nix-prefetch-url.in 2006-08-02 21:13:46.000000000 +0200
|
|
***************
|
|
*** 3,8 ****
|
|
--- 3,11 ----
|
|
url=$1
|
|
expHash=$2
|
|
|
|
+ # to prevent doing more than 1 chroot
|
|
+ unset NIX_ROOT
|
|
+
|
|
hashType=$NIX_HASH_ALGO
|
|
if test -z "$hashType"; then
|
|
hashType=md5
|