forked from lix-project/lix
* In nar.nix, path -> storePath, otherwise we get a collision between
environment variable names on Cygwin (where they are case insensitive).
This commit is contained in:
parent
a61129c48c
commit
5a6b45e252
|
@ -1,5 +1,7 @@
|
|||
{system, path, hashAlgo}: derivation {
|
||||
{system, storePath, hashAlgo}:
|
||||
|
||||
derivation {
|
||||
name = "nar";
|
||||
builder = ./nar.sh;
|
||||
inherit system path hashAlgo;
|
||||
inherit system storePath hashAlgo;
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#! @shell@ -e
|
||||
|
||||
echo "packing $path into $out..."
|
||||
echo "packing $storePath into $out..."
|
||||
@coreutils@/mkdir $out
|
||||
dst=$out/tmp.nar.bz2
|
||||
@bindir@/nix-store --dump "$path" > tmp
|
||||
@bindir@/nix-store --dump "$storePath" > tmp
|
||||
|
||||
@bzip2@ < tmp > $dst
|
||||
|
||||
|
|
|
@ -103,7 +103,7 @@ foreach my $storePath (@storePaths) {
|
|||
# expression.
|
||||
my $nixexpr =
|
||||
"((import $dataDir/nix/corepkgs/nar/nar.nix) " .
|
||||
"{path = \"$storePath\"; system = \"@system@\"; hashAlgo = \"$hashAlgo\";}) ";
|
||||
"{storePath = \"$storePath\"; system = \"@system@\"; hashAlgo = \"$hashAlgo\";}) ";
|
||||
|
||||
print NIX $nixexpr;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue