summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2017-10-13 10:46:44 +0200
committerProfpatsch <mail@profpatsch.de>2017-10-13 10:48:07 +0200
commit2864bc8fd904c28c65486c75136f6d3892023e61 (patch)
tree601be859430e0d56b69570b13b3106f1ee4b8223 /nixos
parentba6f59ad70d7d4b9c36b7d3f1b6f3b1729379114 (diff)
downloadnixpkgs-2864bc8fd904c28c65486c75136f6d3892023e61.tar
nixpkgs-2864bc8fd904c28c65486c75136f6d3892023e61.tar.gz
nixpkgs-2864bc8fd904c28c65486c75136f6d3892023e61.tar.bz2
nixpkgs-2864bc8fd904c28c65486c75136f6d3892023e61.tar.lz
nixpkgs-2864bc8fd904c28c65486c75136f6d3892023e61.tar.xz
nixpkgs-2864bc8fd904c28c65486c75136f6d3892023e61.tar.zst
nixpkgs-2864bc8fd904c28c65486c75136f6d3892023e61.zip
Revert "desktop-managers: do not leak feh to PATH"
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/desktop-managers/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 6509a8a16c9..13f339e3fbf 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -109,5 +109,9 @@ in
 
   };
 
-  xcfg.displayManager.session = cfg.session.list;
+  config = {
+    services.xserver.displayManager.session = cfg.session.list;
+    environment.systemPackages =
+      mkIf cfg.session.needBGPackages [ pkgs.feh ]; # xsetroot via xserver.enable
+  };
 }