wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-12 23:15:08 +02:00
Code Activity

* Merge r3919, r3925, r3926 from the trunk.

Browse source
This commit is contained in:
Eelco Dolstra 2005-09-21 18:15:37 +00:00
parent 04b51d25d1
commit 92a4a81784
3 changed files with 17 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/nix-pull.in
View file

@ -1,7 +1,6 @@
#! @perl@ -w -I@libexecdir@/nix
use strict;
use IPC::Open2;
use POSIX qw(tmpnam);
use readmanifest;
@ -74,11 +73,9 @@ print "$size store paths in manifest\n";
# Register all substitutes.
print STDERR "registering substitutes...\n";
my $pid = open2(\*READ, \*WRITE, "$binDir/nix-store --register-substitutes")
my $pid = open(WRITE, "|$binDir/nix-store --register-substitutes")
or die "cannot run nix-store";
close READ;
foreach my $storePath (keys %narFiles) {
my $narFileList = $narFiles{$storePath};
foreach my $narFile (@{$narFileList}) {
@ -95,7 +92,4 @@ foreach my $storePath (keys %narFiles) {
}
}
close WRITE;
waitpid $pid, 0;
$? == 0 or die "nix-store failed";
close WRITE or die "nix-store failed: $?";