lix-project/lix
20
58
Fork 31
Code Issues 364 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* In nar.nix, path -> storePath, otherwise we get a collision between

Browse source 
environment variable names on Cygwin (where they are case
  insensitive).
This commit is contained in:
Eelco Dolstra 2006-08-07 18:22:57 +00:00
parent a61129c48c
commit 5a6b45e252
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
corepkgs/nar/nar.nix
View file

@ -1,5 +1,7 @@
{system, path, hashAlgo}: derivation { {system, storePath, hashAlgo}:
derivation {
name = "nar"; name = "nar";
builder = ./nar.sh; builder = ./nar.sh;
inherit system path hashAlgo; inherit system storePath hashAlgo;
} }

4
corepkgs/nar/nar.sh.in
View file

@ -1,9 +1,9 @@
#! @shell@ -e #! @shell@ -e
echo "packing $path into $out..." echo "packing $storePath into $out..."
@coreutils@/mkdir $out @coreutils@/mkdir $out
dst=$out/tmp.nar.bz2 dst=$out/tmp.nar.bz2
@bindir@/nix-store --dump "$path" > tmp @bindir@/nix-store --dump "$storePath" > tmp
@bzip2@ < tmp > $dst @bzip2@ < tmp > $dst

2
scripts/nix-push.in
View file

@ -103,7 +103,7 @@ foreach my $storePath (@storePaths) {
# expression. # expression.
my $nixexpr = my $nixexpr =
"((import $dataDir/nix/corepkgs/nar/nar.nix) " . "((import $dataDir/nix/corepkgs/nar/nar.nix) " .
"{path = \"$storePath\"; system = \"@system@\"; hashAlgo = \"$hashAlgo\";}) "; "{storePath = \"$storePath\"; system = \"@system@\"; hashAlgo = \"$hashAlgo\";}) ";
print NIX $nixexpr; print NIX $nixexpr;
} }