From 5a6b45e2523c29c215f77135c6866baa83f1a7d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon, 7 Aug 2006 18:22:57 +0000
Subject: * In nar.nix, path -> storePath, otherwise we get a collision between
   environment variable names on Cygwin (where they are case   insensitive).

---
 corepkgs/nar/nar.nix   | 6 ++++--
 corepkgs/nar/nar.sh.in | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'corepkgs/nar')

diff --git a/corepkgs/nar/nar.nix b/corepkgs/nar/nar.nix
index e0d4878bf4f3..da63bde9a62e 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 caa960877b4b..67933ac67f0b 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
 
-- 
cgit 1.4.1