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

Revert "buildenv: read propagated-user-env-packages line-by-line"

Browse Source 
This reverts commit dce958ac396e88c09d5b19c284f41eef68f54ce7.
This commit is contained in:
adisbladis 2017-08-01 15:41:06 +08:00
parent 903d9daf0f
commit 283364a2fe
No known key found for this signature in database
GPG Key ID: ED58F95069B004F5
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"; my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages";
if (-e $propagatedFN) { if (-e $propagatedFN) {
open PROP, "<$propagatedFN" or die; open PROP, "<$propagatedFN" or die;
while (my $p = <PROP>) { my $propagated = <PROP>;
chomp $p; close PROP;
my @propagated = split ' ', $propagated;
foreach my $p (@propagated) {
$postponed{$p} = 1 unless defined $done{$p}; $postponed{$p} = 1 unless defined $done{$p};
} }
close PROP;
} }
} }