diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-10-18 01:53:13 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 10:17:12 +0100 |
| commit | db81e221487e8f97018b15c20270044c24c6e918 (patch) | |
| tree | 47b2a3fdc968f5bd5c8fa92437d3f6e07952dec3 /pkgs/tools/X11/xlaunch | |
| parent | bff9b546e4722923e86afc99ccacace31f70ee77 (diff) | |
| download | nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.gz nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.bz2 nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.lz nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.xz nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.zst nixlib-db81e221487e8f97018b15c20270044c24c6e918.zip | |
treewide: Mass-replace 'xorgserver}/bin' with correct output
vcunat added one fix in xdummy.
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 06dfd28b7399..ccf998951a34 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 \"^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 )\" + 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.out}/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 |