diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-01-25 18:10:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-25 18:10:46 -0500 |
| commit | 4c813506898a9f03e9b9c9e2f19c0e800a33a542 (patch) | |
| tree | 36a6efdfb26a4e7653ee94962cbf7764b832e962 /nixos | |
| parent | a30a49ca0b3cac55fcbe2779ccbab12b53d5c371 (diff) | |
| parent | 966e56cdfbedc8be3dce8c5ea6050ce4d3075103 (diff) | |
| download | nixpkgs-4c813506898a9f03e9b9c9e2f19c0e800a33a542.tar nixpkgs-4c813506898a9f03e9b9c9e2f19c0e800a33a542.tar.gz nixpkgs-4c813506898a9f03e9b9c9e2f19c0e800a33a542.tar.bz2 nixpkgs-4c813506898a9f03e9b9c9e2f19c0e800a33a542.tar.lz nixpkgs-4c813506898a9f03e9b9c9e2f19c0e800a33a542.tar.xz nixpkgs-4c813506898a9f03e9b9c9e2f19c0e800a33a542.tar.zst nixpkgs-4c813506898a9f03e9b9c9e2f19c0e800a33a542.zip | |
Merge pull request #78421 from worldofpeace/upstream-session-xfce
nixos/xfce: use sessionPackages
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/xfce.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index a08b1947f65..21f59074f3a 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/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 ]; |