diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2013-05-24 00:43:31 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2013-05-24 00:43:31 +0400 |
| commit | 1d38b4842a17b436895cdc5c52c45f0c642337fb (patch) | |
| tree | 23ce6325d1fe4bc5f2390405f86d527953ef28a1 /pkgs/tools/X11 | |
| parent | 4d9e7b2923ada28522f80a29a2fa00acca4953ca (diff) | |
| download | nixlib-1d38b4842a17b436895cdc5c52c45f0c642337fb.tar nixlib-1d38b4842a17b436895cdc5c52c45f0c642337fb.tar.gz nixlib-1d38b4842a17b436895cdc5c52c45f0c642337fb.tar.bz2 nixlib-1d38b4842a17b436895cdc5c52c45f0c642337fb.tar.lz nixlib-1d38b4842a17b436895cdc5c52c45f0c642337fb.tar.xz nixlib-1d38b4842a17b436895cdc5c52c45f0c642337fb.tar.zst nixlib-1d38b4842a17b436895cdc5c52c45f0c642337fb.zip | |
Support pre-start commands from newer NixOS versions in xlaunch
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/xlaunch/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix index 3cab25837e6c..b97c9def8227 100644 --- a/pkgs/tools/X11/xlaunch/default.nix +++ b/pkgs/tools/X11/xlaunch/default.nix @@ -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 |