summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2005-02-01 17:50:48 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2005-02-01 17:50:48 +0000
commitc3981d81f65eda945f7a48d10ce7600fc0419f58 (patch)
treeae87c0de57dca4016df927787de3ed342e083337 /scripts
parent65b6c8ab4c7832abdad46a29ce2ef18d289b2471 (diff)
downloadguix-c3981d81f65eda945f7a48d10ce7600fc0419f58.tar.gz
* Make check fixes.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/nix-pull.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/nix-pull.in b/scripts/nix-pull.in
index ee90a06e27..8bc560ba5f 100644
--- a/scripts/nix-pull.in
+++ b/scripts/nix-pull.in
@@ -19,8 +19,8 @@ $binDir = "@bindir@" unless defined $binDir;
 my $libexecDir = $ENV{"NIX_LIBEXEC_DIR"};
 $libexecDir = "@libexecdir@" unless defined $libexecDir;
 
-my $localStateDir = $ENV{"NIX_LOCALSTATE_DIR"};
-$localStateDir = "@localstatedir@" unless defined $localStateDir;
+my $stateDir = $ENV{"NIX_STATE_DIR"};
+$stateDir = "@localstatedir@/nix" unless defined $stateDir;
 
 
 # Obtain URLs either from the command line or from a configuration file.
@@ -49,7 +49,7 @@ sub processURL {
         or die "cannot hash `$manifest'";
     chomp $hash;
     
-    my $finalPath = "$localStateDir/nix/manifests/$baseName-$hash.nixmanifest";
+    my $finalPath = "$stateDir/manifests/$baseName-$hash.nixmanifest";
     
     system("mv '$manifest' '$finalPath'") == 0
         or die "cannot move `$manifest' to `$finalPath";