diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2017-04-23 05:00:08 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2017-04-28 22:00:14 +0200 |
| commit | 1273f414a784af87363ac440af2ce948b6a656b1 (patch) | |
| tree | 6f5074d50cb5fbd939dd78e8045deac2138bd468 /nixos/modules/services/x11/display-managers/lightdm.nix | |
| parent | 5c25c33a05720f6bf947970f142b72e991e05366 (diff) | |
| download | nixpkgs-1273f414a784af87363ac440af2ce948b6a656b1.tar nixpkgs-1273f414a784af87363ac440af2ce948b6a656b1.tar.gz nixpkgs-1273f414a784af87363ac440af2ce948b6a656b1.tar.bz2 nixpkgs-1273f414a784af87363ac440af2ce948b6a656b1.tar.lz nixpkgs-1273f414a784af87363ac440af2ce948b6a656b1.tar.xz nixpkgs-1273f414a784af87363ac440af2ce948b6a656b1.tar.zst nixpkgs-1273f414a784af87363ac440af2ce948b6a656b1.zip | |
display-managers: Fix the xsession parameters
The xsession script was called with inconsistent (depending on the
display managers) and wrong parameters. The main reason for this where
the spaces the parameter syntax. In order to fix this the old syntax:
$1 = '<desktop-manager> + <window-manager>'
Will be replaced with a new syntax:
$1 = "<desktop-manager>+<window-manager>"
This assumes that neither "<desktop-manager>" nor "<window-manager>"
contain the "+" character but this shouldn't be a problem.
This patch also fixes the quoting by using double quotes (") instead of
single quotes (') [0].
Last but not least this'll add some comments for the better
understanding of the script.
[0]: https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s06.html
Diffstat (limited to 'nixos/modules/services/x11/display-managers/lightdm.nix')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/lightdm.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 82b9a2fce5a..256bfb9ce3f 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -61,7 +61,7 @@ let let dm = xcfg.desktopManager.default; wm = xcfg.windowManager.default; - in dm + optionalString (wm != "none") (" + " + wm); + in dm + optionalString (wm != "none") ("+" + wm); in { # Note: the order in which lightdm greeter modules are imported |