diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-12-04 14:48:47 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-12-04 14:54:31 +0100 |
| commit | a1ae6273626b467906ae964eca4b16b04e9f8953 (patch) | |
| tree | 4b4895947abef86f41778b9fc626922cae34b20a /nixos/modules/services/x11/display-managers/sddm.nix | |
| parent | fd6dbd9d177b9a213cd2830873a6ddd311f743eb (diff) | |
| download | nixpkgs-a1ae6273626b467906ae964eca4b16b04e9f8953.tar nixpkgs-a1ae6273626b467906ae964eca4b16b04e9f8953.tar.gz nixpkgs-a1ae6273626b467906ae964eca4b16b04e9f8953.tar.bz2 nixpkgs-a1ae6273626b467906ae964eca4b16b04e9f8953.tar.lz nixpkgs-a1ae6273626b467906ae964eca4b16b04e9f8953.tar.xz nixpkgs-a1ae6273626b467906ae964eca4b16b04e9f8953.tar.zst nixpkgs-a1ae6273626b467906ae964eca4b16b04e9f8953.zip | |
nixos GDM: fix #19896
- As noted on github, GDM needs different parameters for X. - Making xserverArgs a true list instead of concat-string helps to filter it and it feels more correct anyway. - Tested: gdm+gnome, lightdm+gnome. There seems to be no logout option in gnome, and gdm doesn't offer other sessions, but maybe these are normal.
Diffstat (limited to 'nixos/modules/services/x11/display-managers/sddm.nix')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/sddm.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index dda8d0f7629..6630b8257e4 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -14,7 +14,7 @@ let xserverWrapper = pkgs.writeScript "xserver-wrapper" '' #!/bin/sh ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)} - exec systemd-cat ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@" + exec systemd-cat ${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} "$@" ''; Xsetup = pkgs.writeScript "Xsetup" '' |