diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2013-02-05 17:21:41 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2013-02-05 17:21:51 +0400 |
| commit | 09ee51c442da5dc40c0e8bbfb4bf66489923fca2 (patch) | |
| tree | 73431f3315fb2eb7d3813ba2759e204d90a80417 /pkgs/tools/X11/xlaunch | |
| parent | 24b6ad43c1781c6de8770b351dbd1f2f9679010e (diff) | |
| download | nixlib-09ee51c442da5dc40c0e8bbfb4bf66489923fca2.tar nixlib-09ee51c442da5dc40c0e8bbfb4bf66489923fca2.tar.gz nixlib-09ee51c442da5dc40c0e8bbfb4bf66489923fca2.tar.bz2 nixlib-09ee51c442da5dc40c0e8bbfb4bf66489923fca2.tar.lz nixlib-09ee51c442da5dc40c0e8bbfb4bf66489923fca2.tar.xz nixlib-09ee51c442da5dc40c0e8bbfb4bf66489923fca2.tar.zst nixlib-09ee51c442da5dc40c0e8bbfb4bf66489923fca2.zip | |
Fixing xlaunch for systemd branch
Diffstat (limited to 'pkgs/tools/X11/xlaunch')
| -rw-r--r-- | pkgs/tools/X11/xlaunch/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix index 0bc33bcb7fa1..3cab25837e6c 100644 --- a/pkgs/tools/X11/xlaunch/default.nix +++ b/pkgs/tools/X11/xlaunch/default.nix @@ -45,7 +45,7 @@ EOF else RESET_OPTION=\"-noreset\" fi; - XCMD=\"\$(egrep \"^env\" /etc/init/xserver.conf | sed -e \"s/env/ 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 )\" + 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 )\" echo \"\$XCMD\" echo \"\$XCMD\" | bash & while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done |