about summary refs log tree commit diff
path: root/nixpkgs/nixos/modules/services/x11/desktop-managers
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-01-26 23:38:55 +0000
committerAlyssa Ross <hi@alyssa.is>2020-01-26 23:38:55 +0000
commit02e12559a420f8c544b2facc4931904900a05518 (patch)
treeba39d8fa9e874b935d204e74accfed5caaccf0fa /nixpkgs/nixos/modules/services/x11/desktop-managers
parent542f80867c380b0ac79250b6e5358dda8bc49e0d (diff)
parent3d085a399c436a41d875801619e8f976b8519196 (diff)
downloadnixlib-02e12559a420f8c544b2facc4931904900a05518.tar
nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.gz
nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.bz2
nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.lz
nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.xz
nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.zst
nixlib-02e12559a420f8c544b2facc4931904900a05518.zip
Merge commit '3d085a399c436a41d875801619e8f976b8519196'
Diffstat (limited to 'nixpkgs/nixos/modules/services/x11/desktop-managers')
-rw-r--r--nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix11
1 files changed, 3 insertions, 8 deletions
diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix
index a08b1947f65b..21f59074f3ae 100644
--- a/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -127,14 +127,9 @@ in
       "/share/gtksourceview-4.0"
     ];
 
-    services.xserver.desktopManager.session = [{
-      name = "xfce";
-      bgSupport = true;
-      start = ''
-        ${pkgs.runtimeShell} ${pkgs.xfce.xfce4-session.xinitrc} &
-        waitPID=$!
-      '';
-    }];
+    services.xserver.displayManager.sessionPackages = [
+      pkgs.xfce.xfce4-session
+    ];
 
     services.xserver.updateDbusEnvironment = true;
     services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];