diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2017-04-23 03:19:07 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2017-04-23 03:19:07 +0200 |
| commit | e1244f6e8a34ce7d0c96fce398e02938bc4f13d5 (patch) | |
| tree | 3c81abcd464ff66fefbfe40505813e55565c0fbb /nixos | |
| parent | e019978d027b60440119a5906041991866325621 (diff) | |
| download | nixpkgs-e1244f6e8a34ce7d0c96fce398e02938bc4f13d5.tar nixpkgs-e1244f6e8a34ce7d0c96fce398e02938bc4f13d5.tar.gz nixpkgs-e1244f6e8a34ce7d0c96fce398e02938bc4f13d5.tar.bz2 nixpkgs-e1244f6e8a34ce7d0c96fce398e02938bc4f13d5.tar.lz nixpkgs-e1244f6e8a34ce7d0c96fce398e02938bc4f13d5.tar.xz nixpkgs-e1244f6e8a34ce7d0c96fce398e02938bc4f13d5.tar.zst nixpkgs-e1244f6e8a34ce7d0c96fce398e02938bc4f13d5.zip | |
Revert "display-manager: fix argument handling of sddm"
This reverts commit 6b7c5ba5353e2a81255879173de758fc5f08be62. Unfortunately it seems like this broke slim, lightdm and gdm (see #25068 and #23264). This is already reverted in the 17.03 branch (99dfb6d). TODO: We need tests for slim and lightdm and fix the test for gdm (failing since 2016-10-26) to prevent such breakage in the future.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/default.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 543fd939914..4e2c0e01ca0 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -32,14 +32,8 @@ let '' #! ${pkgs.bash}/bin/bash - # SDDM splits "Exec" line in .desktop file by whitespace and pass script path as $1 - if [[ "$0" = "$1" ]]; then - # remove superfluous $1 again - shift - # join arguments again and evaluate them in a shell context - # to interpret shell quoting - eval exec "$0" "$@" - fi + # Handle being called by SDDM. + if test "''${1:0:1}" = / ; then eval exec $1 $2 ; fi ${optionalString cfg.displayManager.logToJournal '' if [ -z "$_DID_SYSTEMD_CAT" ]; then |