Skip to content

Commit

Permalink
buildenv: read propagated-user-env-packages line-by-line
Browse files Browse the repository at this point in the history
Since 3cb745d, 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.
  • Loading branch information
ttuegel committed Jul 16, 2017
1 parent ae26f29 commit dce958a
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions pkgs/build-support/buildenv/builder.pl
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down

0 comments on commit dce958a

Please sign in to comment.