1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 06:01:48 +02:00

* Switched from wget to curl.

* Made the dependencies on bzip2 and the shell explicit.
This commit is contained in:
Eelco Dolstra 2004-04-06 08:18:51 +00:00
parent 59b94ee18a
commit 03f1d1ecb5
11 changed files with 47 additions and 36 deletions

View file

@ -65,7 +65,7 @@ $fullexpr .= "]";
# Instantiate store expressions from the Nix expressions we created above.
print STDERR "instantiating store expressions...\n";
my $pid = open2(\*READ, \*WRITE, "nix-instantiate -") or die "cannot run nix-instantiate";
my $pid = open2(\*READ, \*WRITE, "@bindir@/nix-instantiate -") or die "cannot run nix-instantiate";
print WRITE $fullexpr;
close WRITE;
@ -91,7 +91,7 @@ while (scalar @subs > 0) {
if ($n > 256) { $n = 256 };
my @subs2 = @subs[0..$n - 1];
@subs = @subs[$n..scalar @subs - 1];
system "nix-store --substitute @subs2";
system "@bindir@/nix-store --substitute @subs2";
if ($?) { die "`nix-store --substitute' failed"; }
}
@ -104,6 +104,6 @@ while (scalar @sucs > 0) {
if ($n > 256) { $n = 256 };
my @sucs2 = @sucs[0..$n - 1];
@sucs = @sucs[$n..scalar @sucs - 1];
system "nix-store --successor @sucs2";
system "@bindir@/nix-store --successor @sucs2";
if ($?) { die "`nix-store --successor' failed"; }
}