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

* build-remote.pl: drop a hard-coded reference to /nix/etc/nix.

Browse source
This commit is contained in:
Eelco Dolstra 2011-11-23 12:21:35 +00:00
parent 993fa94fb4
commit ab20af3e6f
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
perl/lib/Nix/Config.pm.in
View file

@ -4,6 +4,7 @@ $binDir = $ENV{"NIX_BIN_DIR"} || "@bindir@";
$libexecDir = $ENV{"NIX_LIBEXEC_DIR"} || "@libexecdir@"; $libexecDir = $ENV{"NIX_LIBEXEC_DIR"} || "@libexecdir@";
$manifestDir = $ENV{"NIX_MANIFESTS_DIR"} || "@localstatedir@/nix/manifests"; $manifestDir = $ENV{"NIX_MANIFESTS_DIR"} || "@localstatedir@/nix/manifests";
$logDir = $ENV{"NIX_LOG_DIR"} || "@localstatedir@/log/nix"; $logDir = $ENV{"NIX_LOG_DIR"} || "@localstatedir@/log/nix";
$confDir = $ENV{"NIX_CONF_DIR"} || "@sysconfdir@/nix";
$bzip2 = $ENV{"NIX_BZIP2"} || "@bzip2@"; $bzip2 = $ENV{"NIX_BZIP2"} || "@bzip2@";
$curl = "@curl@"; $curl = "@curl@";

3
scripts/build-remote.pl.in
View file

@ -3,6 +3,7 @@
use Fcntl ':flock'; use Fcntl ':flock';
use English '-no_match_vars'; use English '-no_match_vars';
use IO::Handle; use IO::Handle;
use Nix::Config;
use Nix::SSH qw/sshOpts openSSHConnection/; use Nix::SSH qw/sshOpts openSSHConnection/;
no warnings('once'); no warnings('once');
@ -208,7 +209,7 @@ print STDERR "@ build-remote $drvPath $hostName\n" if $printBuildTrace;
my $maybeSign = ""; my $maybeSign = "";
$maybeSign = "--sign" if -e "/nix/etc/nix/signing-key.sec"; $maybeSign = "--sign" if -e "$Nix::Config::confDir/signing-key.sec";
# Register the derivation as a temporary GC root. Note that $PPID is # Register the derivation as a temporary GC root. Note that $PPID is