Revert "display-manager: fix argument handling of sddm"

This reverts commit 6b7c5ba. 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.
NixOS · Apr 23, 2017 · e1244f6 · e1244f6
1 parent e019978
commit e1244f6
Showing 1 changed file with 2 additions and 8 deletions.
diff --git 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