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

  environment variable names on Cygwin (where they are case
  insensitive).

3 files changed, 7 insertions, 5 deletions

diff --git a/corepkgs/nar/nar.nix b/corepkgs/nar/nar.nix
index e0d4878bf4..da63bde9a6 100644
--- a/corepkgs/nar/nar.nix
+++ b/corepkgs/nar/nar.nix
@@ -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;
 }
diff --git a/corepkgs/nar/nar.sh.in b/corepkgs/nar/nar.sh.in
index caa960877b..67933ac67f 100644
--- a/corepkgs/nar/nar.sh.in
+++ b/corepkgs/nar/nar.sh.in
@@ -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
 
diff --git a/scripts/nix-push.in b/scripts/nix-push.in
index 7d285e0034..373533190a 100644
--- a/scripts/nix-push.in
+++ b/scripts/nix-push.in
@@ -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;
 }