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

Merge pull request #27427 from ttuegel/bugfix/buildenv-propagated

Browse Source 
buildenv: read propagated-user-env-packages line-by-line
This commit is contained in:
Thomas Tuegel 2017-07-17 16:20:36 -05:00 committed by GitHub
commit 54520fce77
1 changed files with 3 additions and 4 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,12 +141,11 @@ sub addPkg {
my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages";
if (-e $propagatedFN) {
open PROP, "<$propagatedFN" or die;
my $propagated = <PROP>;
close PROP;
my @propagated = split ' ', $propagated;
foreach my $p (@propagated) {
while (my $p = <PROP>) {
chomp $p;
$postponed{$p} = 1 unless defined $done{$p};
}
close PROP;
}
}