diff options
| author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2017-07-17 16:20:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-17 16:20:36 -0500 |
| commit | 54520fce779695ef2d5dfa98ae20126c53d21692 (patch) | |
| tree | 2366c8aab01dac8434ba17a2c20d3933d2c7c6e3 /pkgs/build-support | |
| parent | 09d918d533697ab31500ee8610cee8b7eae1e8ab (diff) | |
| parent | dce958ac396e88c09d5b19c284f41eef68f54ce7 (diff) | |
| download | nixlib-54520fce779695ef2d5dfa98ae20126c53d21692.tar nixlib-54520fce779695ef2d5dfa98ae20126c53d21692.tar.gz nixlib-54520fce779695ef2d5dfa98ae20126c53d21692.tar.bz2 nixlib-54520fce779695ef2d5dfa98ae20126c53d21692.tar.lz nixlib-54520fce779695ef2d5dfa98ae20126c53d21692.tar.xz nixlib-54520fce779695ef2d5dfa98ae20126c53d21692.tar.zst nixlib-54520fce779695ef2d5dfa98ae20126c53d21692.zip | |
Merge pull request #27427 from ttuegel/bugfix/buildenv-propagated
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, 3 insertions, 4 deletions
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 678f5a3fe9e6..7cc37d156735 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -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; } } |