1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 20:21:14 +00:00
nixpkgs/pkgs
aszlig ab84149c99
buildEnv: Pass the right number of args to addPkg
Regression introduced by 4529ed1259.

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
2016-01-28 14:50:44 +01:00
..
applications eclipse-plugin-scala: 4.1.1.20151201 -> 4.3.0.201512011535 2016-01-27 19:33:28 +01:00
build-support buildEnv: Pass the right number of args to addPkg 2016-01-28 14:50:44 +01:00
data More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
desktops Merge pull request #12501 from DamienCassou/gpaste-3.18.3 2016-01-28 07:53:08 +01:00
development titaniumenv: remove obsolete iosWwdrCertificate parameter 2016-01-28 13:32:21 +00:00
games steam: actually propagate flags to the runtime, now from chrootenv wrapper 2016-01-27 00:58:23 +03:00
misc samsung-unified-linux-driver: add 1.00.37 2016-01-26 04:09:36 +01:00
os-specific pagemon: init at 0.01.06 2016-01-27 04:42:12 +01:00
servers Merge pull request #12552 from NixOS/python-wip 2016-01-27 13:19:00 +01:00
shells Add version attribute where maintainers |= nckx 2016-01-25 17:35:21 +01:00
stdenv Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
test
tools disnix: bump to version 0.5 2016-01-27 22:32:34 +00:00
top-level Merge pull request #12630 from hrdinka/add/b2 2016-01-28 00:01:05 +03:00