summary refs log tree commit diff
path: root/nixos/modules/services/x11
diff options
context:
space:
mode:
authorYegor Timoshenko <yegortimoshenko@gmail.com>2017-12-18 01:14:58 +0000
committerOrivej Desh <orivej@gmx.fr>2017-12-21 01:43:38 +0000
commit71a8dbb956f5735030cd3982263d72f1bffdae23 (patch)
treed9fe0082eed7fdac982e04e61eddb4f552e18e52 /nixos/modules/services/x11
parentc8a4e906de69862277e85f0ef05aca53f5fd3f7b (diff)
downloadnixlib-71a8dbb956f5735030cd3982263d72f1bffdae23.tar
nixlib-71a8dbb956f5735030cd3982263d72f1bffdae23.tar.gz
nixlib-71a8dbb956f5735030cd3982263d72f1bffdae23.tar.bz2
nixlib-71a8dbb956f5735030cd3982263d72f1bffdae23.tar.lz
nixlib-71a8dbb956f5735030cd3982263d72f1bffdae23.tar.xz
nixlib-71a8dbb956f5735030cd3982263d72f1bffdae23.tar.zst
nixlib-71a8dbb956f5735030cd3982263d72f1bffdae23.zip
nixos/desktop-managers: do not leak feh to PATH
(originally from f9415cb6219de00903f62a1f0facc4852225118c)

feh is used to set background image for desktop managers that do not
support it directly, however there is no need to include it in PATH.

Fixes #17450.
Diffstat (limited to 'nixos/modules/services/x11')
-rw-r--r--nixos/modules/services/x11/desktop-managers/default.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 39b27d4ceb61..4622c7b760f0 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -109,9 +109,5 @@ in
 
   };
 
-  config = {
-    services.xserver.displayManager.session = cfg.session.list;
-    environment.systemPackages =
-      mkIf cfg.session.needBGPackages [ pkgs.feh ]; # xsetroot via xserver.enable
-  };
+  config.services.xserver.displayManager.session = cfg.session.list;
 }