summary refs log tree commit diff
path: root/nixos/modules/config
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-05-05 11:35:11 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-05-05 11:56:31 +0200
commitc2fff7283676110607b6d85de0323aedf440d86e (patch)
tree101c2701d510cf164cacfd2f2cbd871fa566564c /nixos/modules/config
parentcefdc20c00ffc4210eb84cb8aeaa83c3ccca3c29 (diff)
downloadnixlib-c2fff7283676110607b6d85de0323aedf440d86e.tar
nixlib-c2fff7283676110607b6d85de0323aedf440d86e.tar.gz
nixlib-c2fff7283676110607b6d85de0323aedf440d86e.tar.bz2
nixlib-c2fff7283676110607b6d85de0323aedf440d86e.tar.lz
nixlib-c2fff7283676110607b6d85de0323aedf440d86e.tar.xz
nixlib-c2fff7283676110607b6d85de0323aedf440d86e.tar.zst
nixlib-c2fff7283676110607b6d85de0323aedf440d86e.zip
systemPackages, makeLibraryPath: try to guess outputs
Diffstat (limited to 'nixos/modules/config')
-rw-r--r--nixos/modules/config/system-path.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index d22f9ebd1dfd..58ebea1dabc2 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -115,7 +115,15 @@ in
 
     system.path = pkgs.buildEnv {
       name = "system-path";
-      paths = config.environment.systemPackages;
+      paths = let
+        #outputs TODO: make it user-customizable?
+        pkgOutputFun = pkg: lib.filter (p: p!=null) [
+          (pkg.bin or (pkg.out or pkg))
+          (pkg.man or null)
+          (pkg.info or null)
+          (pkg.doc or null)
+        ];
+        in lib.concatMap pkgOutputFun config.environment.systemPackages;
       inherit (config.environment) pathsToLink;
       ignoreCollisions = true;
       # !!! Hacky, should modularise.