ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 04:28:40 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Since 3cb745d5a6, 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.
This commit is contained in:
Thomas Tuegel 2017-07-16 11:39:40 -05:00
parent ae26f291bc
commit dce958ac39
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
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"; 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;
my $propagated = <PROP>; while (my $p = <PROP>) {
close PROP; chomp $p;
my @propagated = split ' ', $propagated;
foreach my $p (@propagated) {
$postponed{$p} = 1 unless defined $done{$p}; $postponed{$p} = 1 unless defined $done{$p};
} }
close PROP;
} }
} }