diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-08-03 11:17:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-03 11:17:34 -0400 |
| commit | f1d48ca6ba77af581fa05d9ea42bfe83da6f0c8d (patch) | |
| tree | 60602c856508e32ee1fec684ec14c577ed5d7868 /pkgs/build-support | |
| parent | 5d91e806b9acca860a0e69c9a144e7a8618d0f2c (diff) | |
| parent | 283364a2fec0ed3510ed9ac8f5fc4bf60408eb1d (diff) | |
| download | nixlib-f1d48ca6ba77af581fa05d9ea42bfe83da6f0c8d.tar nixlib-f1d48ca6ba77af581fa05d9ea42bfe83da6f0c8d.tar.gz nixlib-f1d48ca6ba77af581fa05d9ea42bfe83da6f0c8d.tar.bz2 nixlib-f1d48ca6ba77af581fa05d9ea42bfe83da6f0c8d.tar.lz nixlib-f1d48ca6ba77af581fa05d9ea42bfe83da6f0c8d.tar.xz nixlib-f1d48ca6ba77af581fa05d9ea42bfe83da6f0c8d.tar.zst nixlib-f1d48ca6ba77af581fa05d9ea42bfe83da6f0c8d.zip | |
Merge pull request #27859 from adisbladis/revert_27427
Revert "buildenv: read propagated-user-env-packages line-by-line"
Diffstat (limited to 'pkgs/build-support')
| -rwxr-xr-x | pkgs/build-support/buildenv/builder.pl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 7cc37d156735..678f5a3fe9e6 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -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; } } |