public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/display-managers: Quote "$vars" (#25199)

Browse Source
This commit is contained in:
Judson Lester 2017-04-27 09:01:48 -07:00 committed by Franz Pletz
parent de688d90ba
commit 0d72629570
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/x11/display-managers/default.nix
View File

@ -33,7 +33,7 @@ let
#! ${pkgs.bash}/bin/bash #! ${pkgs.bash}/bin/bash
# Handle being called by SDDM. # Handle being called by SDDM.
if test "''${1:0:1}" = / ; then eval exec $1 $2 ; fi if test "''${1:0:1}" = / ; then eval exec "$1" "$2" ; fi
${optionalString cfg.displayManager.logToJournal '' ${optionalString cfg.displayManager.logToJournal ''
if [ -z "$_DID_SYSTEMD_CAT" ]; then if [ -z "$_DID_SYSTEMD_CAT" ]; then
@ -115,7 +115,7 @@ let
: ''${desktopManager:=${cfg.desktopManager.default}} : ''${desktopManager:=${cfg.desktopManager.default}}
# Start the window manager. # Start the window manager.
case $windowManager in case "$windowManager" in
${concatMapStrings (s: '' ${concatMapStrings (s: ''
(${s.name}) (${s.name})
${s.start} ${s.start}
@ -125,7 +125,7 @@ let
esac esac
# Start the desktop manager. # Start the desktop manager.
case $desktopManager in case "$desktopManager" in
${concatMapStrings (s: '' ${concatMapStrings (s: ''
(${s.name}) (${s.name})
${s.start} ${s.start}