about summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-07-01T11·30+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-07-01T11·30+0200
commit798671163254d9766f711f4e8101bc72bcf4bd5c (patch)
treee7ed55352993bc5482efbcc63dabb0795b00816a /scripts
parent1917d750a0363f678a93c80c5a4e48e7493b1786 (diff)
copy-from-other-stores.pl: Respect $NIX_BIN_DIR
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/copy-from-other-stores.pl.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/copy-from-other-stores.pl.in b/scripts/copy-from-other-stores.pl.in
index 6a0de1f050e5..bfd38c9ba3f8 100755
--- a/scripts/copy-from-other-stores.pl.in
+++ b/scripts/copy-from-other-stores.pl.in
@@ -30,7 +30,7 @@ sub findStorePath {
         next unless -e $sourcePath || -l $sourcePath;
         $ENV{"NIX_DB_DIR"} = "$store/var/nix/db";
         return ($store, $sourcePath) if
-            system("@bindir@/nix-store --check-validity $storePath") == 0;
+            system("$binDir/nix-store --check-validity $storePath") == 0;
     }
     return undef;
 }
@@ -56,16 +56,16 @@ if ($ARGV[0] eq "--query") {
 
                 $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;
                 chomp $deriver;
                 $deriver = "" if $deriver eq "unknown-deriver";
 
                 my @references = split "\n",
-                    `@bindir@/nix-store --query --references $storePath`;
+                    `$binDir/nix-store --query --references $storePath`;
                 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;
                 chomp $narSize;