diff options
| author | volth <volth@webmaster.ms> | 2017-01-18 02:57:15 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-01-18 02:57:15 +0300 |
| commit | 69ed58d88ff7eb864ddb9cf0fd4fff9eebca9f0c (patch) | |
| tree | e6221d51471121538f2240915fc02a33ef8e8f69 /pkgs/servers/x11/xquartz | |
| parent | 9fc3ce73d1b0a0a5da4a80987b0a5c79c0862a20 (diff) | |
xorg.xserver: configure --with-xkb-path= (#21653)
Diffstat (limited to 'pkgs/servers/x11/xquartz')
| -rw-r--r-- | pkgs/servers/x11/xquartz/default.nix | 3 | ||||
| -rwxr-xr-x | pkgs/servers/x11/xquartz/startx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 2fc012dc6c9d4..0357c8c17f1d3 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, substituteAll, xterm, makeWrapper, ruby -, openssl, quartz-wm, fontconfig, xkeyboard_config, xlsfonts, xfontsel +, openssl, quartz-wm, fontconfig, xlsfonts, xfontsel , ttf_bitstream_vera, freefont_ttf, liberation_ttf_binary , shell ? "${bashInteractive}/bin/bash" }: @@ -126,7 +126,6 @@ in stdenv.mkDerivation { --replace "@DEFAULT_CLIENT@" "${xterm}/bin/xterm" \ --replace "@XINIT@" "$out/bin/xinit" \ --replace "@XINITRC@" "$out/etc/X11/xinit/xinitrc" \ - --replace "@XKEYBOARD_CONFIG@" "${xkeyboard_config}/etc/X11/xkb" \ --replace "@FONTCONFIG_FILE@" "$fontsConfPath" wrapProgram $out/bin/Xquartz \ diff --git a/pkgs/servers/x11/xquartz/startx b/pkgs/servers/x11/xquartz/startx index 131fbc43b8b64..e908e1042d782 100755 --- a/pkgs/servers/x11/xquartz/startx +++ b/pkgs/servers/x11/xquartz/startx @@ -217,7 +217,7 @@ EOF done fi -eval @XINIT@ \"$client\" $clientargs -- \"$server\" $display $serverargs "-xkbdir" "@XKEYBOARD_CONFIG@" +eval @XINIT@ \"$client\" $clientargs -- \"$server\" $display $serverargs retval=$? if [ x"$enable_xauth" = x1 ] ; then |