summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2017-10-13 11:13:21 +0800
committerGitHub <noreply@github.com>2017-10-13 11:13:21 +0800
commitf7ba92bfa3437efc84becce14a132a9da78b6882 (patch)
treeba09710042e8aa2d1f486468f8b05b2a37137e7d /nixos
parent71b7b4f19c2a06020770894243acf37b263d6ff8 (diff)
parentf9415cb6219de00903f62a1f0facc4852225118c (diff)
downloadnixlib-f7ba92bfa3437efc84becce14a132a9da78b6882.tar
nixlib-f7ba92bfa3437efc84becce14a132a9da78b6882.tar.gz
nixlib-f7ba92bfa3437efc84becce14a132a9da78b6882.tar.bz2
nixlib-f7ba92bfa3437efc84becce14a132a9da78b6882.tar.lz
nixlib-f7ba92bfa3437efc84becce14a132a9da78b6882.tar.xz
nixlib-f7ba92bfa3437efc84becce14a132a9da78b6882.tar.zst
nixlib-f7ba92bfa3437efc84becce14a132a9da78b6882.zip
Merge pull request #30286 from yegortimoshenko/patch-2
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, 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;
 }