JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some NIX_ROOT fixes

Browse Source 
svn path=/nixpkgs/trunk/; revision=6015
This commit is contained in:
Armijn Hemel 2006-08-01 18:32:24 +00:00
parent 4fb1ec6a36
commit 0ac74d23dc
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/nix-unstable/default.nix
View File

@ -16,4 +16,8 @@ stdenv.mkDerivation {
};
buildInputs = [aterm bdb perl curl];
inherit storeDir stateDir aterm bdb;
# uncomment if you want to be able to use nix-prefetch-url when NIX_ROOT
# is set
#patches = [./nix-0.10pre5679.patch];
}

25
pkgs/misc/nix-unstable/nix-0.10pre5679.patch Normal file
View File

@ -0,0 +1,25 @@
diff -ruN nix-0.10pre5679/scripts/nix-prefetch-url.in nix-0.10pre5679.new/scripts/nix-prefetch-url.in
--- nix-0.10pre5679/scripts/nix-prefetch-url.in 2006-07-11 13:24:20.000000000 +0200
+++ nix-0.10pre5679.new/scripts/nix-prefetch-url.in 2006-08-01 11:54:02.000000000 +0200
@@ -39,10 +39,10 @@
tmpPath=/tmp/nix-prefetch-url-$$ # !!! security?
tmpFile=$tmpPath/$name
- mkdir $tmpPath
+ mkdir -p $NIX_ROOT/$tmpPath
# Perform the download.
- @curl@ --fail --location --max-redirs 20 "$url" > $tmpFile
+ @curl@ --fail --location --max-redirs 20 "$url" > $NIX_ROOT/$tmpFile
# Compute the hash.
hash=$(@bindir@/nix-hash --type "$hashType" $hashFormat --flat $tmpFile)
@@ -51,7 +51,7 @@
# Add the downloaded file to the Nix store.
finalPath=$(@bindir@/nix-store --add-fixed "$hashType" $tmpFile)
- if test -n "$tmpPath"; then rm -rf $tmpPath || true; fi
+ if test -n "$NIX_ROOT/$tmpPath"; then rm -rf $NIX_ROOT/$tmpPath || true; fi
if test -n "$expHash" -a "$expHash" != "$hash"; then
echo "hash mismatch for URL \`$url'"