alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Support pre-start commands from newer NixOS versions in xlaunch

Browse source
This commit is contained in:
Michael Raskin 2013-05-24 00:43:31 +04:00
parent 4d9e7b2923
commit 1d38b4842a
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/tools/X11/xlaunch/default.nix
View file

@ -46,6 +46,9 @@ EOF
RESET_OPTION=\"-noreset\"
fi;
XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\"
PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\"
echo \"\$PRE_XCMD\"
echo \"\$PRE_XCMD\" | bash
echo \"\$XCMD\"
echo \"\$XCMD\" | bash &
while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done