lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

copy-from-other-stores.pl: Respect $NIX_BIN_DIR

Browse source
This commit is contained in:
Eelco Dolstra 2013-07-01 13:30:28 +02:00
parent 1917d750a0
commit 7986711632
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/copy-from-other-stores.pl.in
View file

@ -30,7 +30,7 @@ sub findStorePath {
next unless -e $sourcePath || -l $sourcePath; next unless -e $sourcePath || -l $sourcePath;
$ENV{"NIX_DB_DIR"} = "$store/var/nix/db"; $ENV{"NIX_DB_DIR"} = "$store/var/nix/db";
return ($store, $sourcePath) if return ($store, $sourcePath) if
system("@bindir@/nix-store --check-validity $storePath") == 0; system("$binDir/nix-store --check-validity $storePath") == 0;
} }
return undef; return undef;
} }
@ -56,16 +56,16 @@ if ($ARGV[0] eq "--query") {
$ENV{"NIX_DB_DIR"} = "$store/var/nix/db"; $ENV{"NIX_DB_DIR"} = "$store/var/nix/db";
my $deriver = `@bindir@/nix-store --query --deriver $storePath`; my $deriver = `$binDir/nix-store --query --deriver $storePath`;
die "cannot query deriver of `$storePath'" if $? != 0; die "cannot query deriver of `$storePath'" if $? != 0;
chomp $deriver; chomp $deriver;
$deriver = "" if $deriver eq "unknown-deriver"; $deriver = "" if $deriver eq "unknown-deriver";
my @references = split "\n", my @references = split "\n",
`@bindir@/nix-store --query --references $storePath`; `$binDir/nix-store --query --references $storePath`;
die "cannot query references of `$storePath'" if $? != 0; die "cannot query references of `$storePath'" if $? != 0;
my $narSize = `@bindir@/nix-store --query --size $storePath`; my $narSize = `$binDir/nix-store --query --size $storePath`;
die "cannot query size of `$storePath'" if $? != 0; die "cannot query size of `$storePath'" if $? != 0;
chomp $narSize; chomp $narSize;