diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-11-26 20:17:20 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-11-26 20:17:20 +0000 |
| commit | fe10a3aed5911f4858d667d611c94bb77a375b75 (patch) | |
| tree | ee89f6edc6c2b446f5ba5898ba36ad3fcc85b35f /pkgs | |
| parent | 95970eb095161b7c6f56223aa049ca7d2c266f6f (diff) | |
| download | nixlib-fe10a3aed5911f4858d667d611c94bb77a375b75.tar nixlib-fe10a3aed5911f4858d667d611c94bb77a375b75.tar.gz nixlib-fe10a3aed5911f4858d667d611c94bb77a375b75.tar.bz2 nixlib-fe10a3aed5911f4858d667d611c94bb77a375b75.tar.lz nixlib-fe10a3aed5911f4858d667d611c94bb77a375b75.tar.xz nixlib-fe10a3aed5911f4858d667d611c94bb77a375b75.tar.zst nixlib-fe10a3aed5911f4858d667d611c94bb77a375b75.zip | |
Update xlaunch to match NixOS update
svn path=/nixpkgs/trunk/; revision=18655
Diffstat (limited to 'pkgs')
| -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 1063cdd8ee67..2c28e986afba 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/event.d/xserver | 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 \"^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 )\" echo \"\$XCMD\" echo \"\$XCMD\" | bash & while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done |