diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-01-27 12:44:56 +0100 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-01-28 14:50:44 +0100 |
commit | ab84149c9986af066bd518e0970be0a344f6a5fa (patch) | |
tree | af017d39d3082f4a166629037865d12cf110e723 /pkgs/build-support/buildenv/builder.pl | |
parent | b205b587e7ab22e5e5763646369ce63ffd2ee150 (diff) | |
download | nixpkgs-ab84149c9986af066bd518e0970be0a344f6a5fa.tar nixpkgs-ab84149c9986af066bd518e0970be0a344f6a5fa.tar.gz nixpkgs-ab84149c9986af066bd518e0970be0a344f6a5fa.tar.bz2 nixpkgs-ab84149c9986af066bd518e0970be0a344f6a5fa.tar.lz nixpkgs-ab84149c9986af066bd518e0970be0a344f6a5fa.tar.xz nixpkgs-ab84149c9986af066bd518e0970be0a344f6a5fa.tar.zst nixpkgs-ab84149c9986af066bd518e0970be0a344f6a5fa.zip |
buildEnv: Pass the right number of args to addPkg
Regression introduced by 4529ed12590d7f814e40223437c7df4fea492e2d. I've missed this in #5096, not because of a messed up rebase as I have guessed from a comment on #12635 but missed this in the first place. The testing I did while working on the pull request weren't exhaustive enough to cover this, because I haven't tested with packages that use the propagatedUserEnvPkgs attribute. In order to make the test a bit more exhaustive this time, let's test it using: nix-build -E 'with import ./. {}; buildEnv { name = "testenv"; paths = [ pkgs.hello pkgs.binutils pkgs.libsoup pkgs.gnome3.yelp pkgs.gnome3.totem ]; }' And with this commit the errors no longer show up and the environment is built correctly. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Fixes: #12635
Diffstat (limited to 'pkgs/build-support/buildenv/builder.pl')
-rwxr-xr-x | pkgs/build-support/buildenv/builder.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index c505473ee72..f6cfe52dc31 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -169,7 +169,7 @@ while (scalar(keys %postponed) > 0) { my @pkgDirs = keys %postponed; %postponed = (); foreach my $pkgDir (sort @pkgDirs) { - addPkg($pkgDir, 2, $priorityCounter++); + addPkg($pkgDir, 2, $ENV{"checkCollisionContents"} eq "1", $priorityCounter++); } } |