3
0
Fork 0
forked from mirrors/nixpkgs

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

This reverts commit 40a5498c3f.

It breaks slim:

Apr 22 21:04:23 hagbard xsession[1037]: /nix/store/bw00yl4yspl3wlyiwk56bi0hljjr00di-xsession: Window manager '/nix/store/bw00yl4yspl3wlyiwk56bi0hljjr00di-xsession 'xfce'' not found.
Apr 22 21:04:23 hagbard xsession[1037]: /nix/store/bw00yl4yspl3wlyiwk56bi0hljjr00di-xsession: Desktop manager '/nix/store/bw00yl4yspl3wlyiwk56bi0hljjr00di-xsession 'xfce'' not found.

Issue .
This commit is contained in:
Eelco Dolstra 2017-04-22 21:26:36 +02:00
parent 4fe9cf7109
commit 99dfb6dce3

View file

@ -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