From 2995439003a6473fc6531d09900e183b0d5de425 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 14 Mar 2016 12:15:58 +0100 Subject: 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 --- nixos/modules/config/system-path.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'nixos/modules') diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index eb5eba7a042f..69830683d9c5 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. -- cgit 1.4.1