buildEnv: respect meta.outputsToInstall

As a result `systemPackages` now also respect it.
Only nix-env remains and that has a PR filed:
    https://github.com/NixOS/nix/pull/815
This commit is contained in:
Vladimír Čunát
2016-04-07 15:59:44 +02:00
parent 3342f717da
commit 2995439003
3 changed files with 10 additions and 6 deletions
+1 -5
View File
@@ -122,11 +122,7 @@ in
system.path = pkgs.buildEnv {
name = "system-path";
paths =
# The default output probably shouldn't be globally configurable.
# Services and users should specify them explicitly unless they want this default.
map (p: if p.outputUnspecified or false then p.bin or p.out or p else p)
config.environment.systemPackages;
paths = config.environment.systemPackages;
inherit (config.environment) pathsToLink extraOutputsToLink;
ignoreCollisions = true;
# !!! Hacky, should modularise.