diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-01-03T00·47+0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-01-03T00·47+0000 |
commit | dadbb51d969517c1f2512015ab201dc99088d9a6 (patch) | |
tree | b6bfb335b1049f215cb466895c1910891efdb8bc /scripts/nix-pull.in | |
parent | 48cea0d01ef48733ab38a73a20611f63aeb1b5cc (diff) |
* Use Nix::Config.
Diffstat (limited to 'scripts/nix-pull.in')
-rwxr-xr-x | scripts/nix-pull.in | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/nix-pull.in b/scripts/nix-pull.in index 74545a35004c..136a5c9fa4bd 100755 --- a/scripts/nix-pull.in +++ b/scripts/nix-pull.in @@ -8,9 +8,6 @@ use Nix::Manifest; my $tmpDir = tempdir("nix-pull.XXXXXX", CLEANUP => 1, TMPDIR => 1) or die "cannot create a temporary directory"; -my $libexecDir = ($ENV{"NIX_LIBEXEC_DIR"} or "@libexecdir@"); -my $storeDir = ($ENV{"NIX_STORE_DIR"} or "@storedir@"); -my $stateDir = ($ENV{"NIX_STATE_DIR"} or "@localstatedir@/nix"); my $manifestDir = $Nix::Config::manifestDir; @@ -25,7 +22,7 @@ if (! -e $manifestDir) { # Make sure that the manifests directory is scanned for GC roots. -my $gcRootsDir = "$stateDir/gcroots"; +my $gcRootsDir = "$Nix::Config::stateDir/gcroots"; my $manifestDirLink = "$gcRootsDir/manifests"; if (! -l $manifestDirLink) { symlink($manifestDir, $manifestDirLink) or die "cannot create symlink `$manifestDirLink'"; |