about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTor Hedin Brønner <torhedinbronner@gmail.com>2019-12-29 02:02:24 +0100
committerGitHub <noreply@github.com>2019-12-29 02:02:24 +0100
commit3d70d4ba0b6be256974910e635fadcc0e9579b2a (patch)
treef2b407349947bea70d4242098b05b690a40754e8
parentccf839b5cfb01670f0ef8d31f0d7ba04d9c7eb8f (diff)
downloadnixlib-3d70d4ba0b6be256974910e635fadcc0e9579b2a.tar
nixlib-3d70d4ba0b6be256974910e635fadcc0e9579b2a.tar.gz
nixlib-3d70d4ba0b6be256974910e635fadcc0e9579b2a.tar.bz2
nixlib-3d70d4ba0b6be256974910e635fadcc0e9579b2a.tar.lz
nixlib-3d70d4ba0b6be256974910e635fadcc0e9579b2a.tar.xz
nixlib-3d70d4ba0b6be256974910e635fadcc0e9579b2a.tar.zst
nixlib-3d70d4ba0b6be256974910e635fadcc0e9579b2a.zip
nixos/displayManager: fix typo in legacy sessions (#76626)
xsession gets passed `dm` `wm`, so the desktop manager would be launched
before the window manager resulting in a regular desktop manager
session.

Fixes https://github.com/NixOS/nixpkgs/issues/76625
-rw-r--r--nixos/modules/services/x11/display-managers/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 2d809b5cc9fd..1efd07393765 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -380,7 +380,7 @@ in
         wms = filter (s: s.manage == "window") cfg.displayManager.session;
 
         # Script responsible for starting the window manager and the desktop manager.
-        xsession = wm: dm: pkgs.writeScript "xsession" ''
+        xsession = dm: wm: pkgs.writeScript "xsession" ''
           #! ${pkgs.bash}/bin/bash
 
           # Legacy session script used to construct .desktop files from