diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-07-16 11:39:40 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-07-16 16:06:06 -0500 |
commit | dce958ac396e88c09d5b19c284f41eef68f54ce7 (patch) | |
tree | 343db881216b53966373e3108a71b1e7a1148af7 /pkgs/build-support | |
parent | ae26f291bcb6da0910fd3de47ff970e696f2c155 (diff) | |
download | nixlib-dce958ac396e88c09d5b19c284f41eef68f54ce7.tar nixlib-dce958ac396e88c09d5b19c284f41eef68f54ce7.tar.gz nixlib-dce958ac396e88c09d5b19c284f41eef68f54ce7.tar.bz2 nixlib-dce958ac396e88c09d5b19c284f41eef68f54ce7.tar.lz nixlib-dce958ac396e88c09d5b19c284f41eef68f54ce7.tar.xz nixlib-dce958ac396e88c09d5b19c284f41eef68f54ce7.tar.zst nixlib-dce958ac396e88c09d5b19c284f41eef68f54ce7.zip |
buildenv: read propagated-user-env-packages line-by-line
Since 3cb745d5a69018829ac15f7d5a508135f6bda123, the format of propagated-user-env-packages has changed and propagated packages have not been included by buildenv, including in the system environment. The buildenv builder is modified to read propagated-user-env-packages line-by-line, instead of expecting all packages on one 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; } } |