summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2017-10-13 10:46:44 +0200
committerGitHub <noreply@github.com>2017-10-13 10:46:44 +0200
commita20829544dc37e4f3e9f36261cad6f0424b7f4e3 (patch)
tree601be859430e0d56b69570b13b3106f1ee4b8223
parentflow: 0.56.0 -> 0.57.0 (diff)
downloadnixpkgs-origin/revert-30286-patch-2.tar.gz
Revert "desktop-managers: do not leak feh to PATH"origin/revert-30286-patch-2
-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 6509a8a16c98..13f339e3fbf3 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
+ };
}