diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-14 12:15:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 15:59:44 +0200 |
| commit | 2995439003a6473fc6531d09900e183b0d5de425 (patch) | |
| tree | 6eb88bcd570fe2e4a0e3ed31b2d716888631695b /nixos/modules/config/system-path.nix | |
| parent | 3342f717da7f660b4695f09034abc175a14fda24 (diff) | |
| download | nixpkgs-2995439003a6473fc6531d09900e183b0d5de425.tar nixpkgs-2995439003a6473fc6531d09900e183b0d5de425.tar.gz nixpkgs-2995439003a6473fc6531d09900e183b0d5de425.tar.bz2 nixpkgs-2995439003a6473fc6531d09900e183b0d5de425.tar.lz nixpkgs-2995439003a6473fc6531d09900e183b0d5de425.tar.xz nixpkgs-2995439003a6473fc6531d09900e183b0d5de425.tar.zst nixpkgs-2995439003a6473fc6531d09900e183b0d5de425.zip | |
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
Diffstat (limited to 'nixos/modules/config/system-path.nix')
| -rw-r--r-- | nixos/modules/config/system-path.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index eb5eba7a042..69830683d9c 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -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. |