colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27859 from adisbladis/revert_27427

Browse Source 
Revert "buildenv: read propagated-user-env-packages line-by-line"
This commit is contained in:
John Ericson 2017-08-03 11:17:34 -04:00 committed by GitHub
commit f1d48ca6ba
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/build-support/buildenv/builder.pl
View File

@ -141,11 +141,12 @@ sub addPkg {
my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages";
if (-e $propagatedFN) {
open PROP, "<$propagatedFN" or die;
while (my $p = <PROP>) {
chomp $p;
my $propagated = <PROP>;
close PROP;
my @propagated = split ' ', $propagated;
foreach my $p (@propagated) {
$postponed{$p} = 1 unless defined $done{$p};
}
close PROP;
}
}