summaryrefslogtreecommitdiff
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
parentMerge pull request #30296 from adisbladis/kdeconnect_1_2 (diff)
parentdesktop-managers: do not leak feh to PATH (diff)
downloadnixpkgs-f7ba92bfa3437efc84becce14a132a9da78b6882.tar.gz
Merge pull request #30286 from yegortimoshenko/patch-2
desktop-managers: do not leak feh to PATH
-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;
}