mirror of
https://github.com/NixOS/nix
synced 2025-07-06 21:41:48 +02:00
* Use Nix::Config.
This commit is contained in:
parent
48cea0d01e
commit
dadbb51d96
4 changed files with 15 additions and 22 deletions
|
@ -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'";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue