Author: eelco
Date: Wed May 4 14:56:36 2011
New Revision: 27147
URL: https://svn.nixos.org/websvn/nix/?rev=27147&sc=1
Log:
* Convenience: figure out our own prefix.
Modified:
cloud/trunk/src/eval-machine-info.nix
cloud/trunk/src/nixos-deploy-network.pl
Modified: cloud/trunk/src/eval-machine-info.nix
==============================================================================
--- cloud/trunk/src/eval-machine-info.nix Wed May 4 14:10:17 2011
(r27146)
+++ cloud/trunk/src/eval-machine-info.nix Wed May 4 14:56:36 2011
(r27147)
@@ -1,5 +1,5 @@
{ nixpkgs ? builtins.getEnv "NIXPKGS_ALL"
-, nixos ? builtins.getEnv "NIXOS"
+, nixos ? if builtins.getEnv "NIXOS" == "" then /etc/nixos/nixos else
builtins.getEnv "NIXOS"
, system ? builtins.currentSystem
, networkExprs
}:
Modified: cloud/trunk/src/nixos-deploy-network.pl
==============================================================================
--- cloud/trunk/src/nixos-deploy-network.pl Wed May 4 14:10:17 2011
(r27146)
+++ cloud/trunk/src/nixos-deploy-network.pl Wed May 4 14:56:36 2011
(r27147)
@@ -2,6 +2,8 @@
use utf8;
use XML::LibXML;
+use Cwd;
+use File::Basename;
binmode(STDERR, ":utf8");
@@ -9,6 +11,8 @@
my @machines = ();
my $outPath;
+my $myDir = dirname(Cwd::abs_path($0));
+
sub main {
# Parse the command line.
@@ -45,7 +49,7 @@
sub evalMachineInfo {
my $machineInfoXML =
- `nix-instantiate --eval-only --xml --strict ./eval-machine-info.nix
--arg networkExprs '[ @networkExprs ]' -A machineInfo`;
+ `nix-instantiate --eval-only --xml --strict
$myDir/eval-machine-info.nix --arg networkExprs '[ @networkExprs ]' -A
machineInfo`;
die "evaluation of @networkExprs failed" unless $? == 0;
#print $machineInfoXML, "\n";
@@ -146,7 +150,7 @@
sub buildConfigs {
print STDERR "building all machine configurations...\n";
- $outPath = `nix-build ./eval-machine-info.nix --arg networkExprs '[
@networkExprs ./state.nix ]' -A machines`;
+ $outPath = `nix-build $myDir/eval-machine-info.nix --arg networkExprs '[
@networkExprs ./state.nix ]' -A machines`;
die "unable to build all machine configurations" unless $? == 0;
chomp $outPath;
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
