about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorYegor Timoshenko <yegortimoshenko@gmail.com>2017-10-10 15:46:33 +0000
committerGitHub <noreply@github.com>2017-10-10 15:46:33 +0000
commitf9415cb6219de00903f62a1f0facc4852225118c (patch)
treeba0ce5034275d3b94c2119537b88963f5af06579 /nixos
parentef291b52f3c4efa4da8b7c12c6d96e4ae0bcef41 (diff)
downloadnixlib-f9415cb6219de00903f62a1f0facc4852225118c.tar
nixlib-f9415cb6219de00903f62a1f0facc4852225118c.tar.gz
nixlib-f9415cb6219de00903f62a1f0facc4852225118c.tar.bz2
nixlib-f9415cb6219de00903f62a1f0facc4852225118c.tar.lz
nixlib-f9415cb6219de00903f62a1f0facc4852225118c.tar.xz
nixlib-f9415cb6219de00903f62a1f0facc4852225118c.tar.zst
nixlib-f9415cb6219de00903f62a1f0facc4852225118c.zip
desktop-managers: do not leak feh to PATH
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')
-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 13f339e3fbf3..6509a8a16c98 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
-  };
+  xcfg.displayManager.session = cfg.session.list;
 }