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/tools/X11 | |
| parent | 9fc3ce73d1b0a0a5da4a80987b0a5c79c0862a20 (diff) | |
| download | nixlib-69ed58d88ff7eb864ddb9cf0fd4fff9eebca9f0c.tar nixlib-69ed58d88ff7eb864ddb9cf0fd4fff9eebca9f0c.tar.gz nixlib-69ed58d88ff7eb864ddb9cf0fd4fff9eebca9f0c.tar.bz2 nixlib-69ed58d88ff7eb864ddb9cf0fd4fff9eebca9f0c.tar.lz nixlib-69ed58d88ff7eb864ddb9cf0fd4fff9eebca9f0c.tar.xz nixlib-69ed58d88ff7eb864ddb9cf0fd4fff9eebca9f0c.tar.zst nixlib-69ed58d88ff7eb864ddb9cf0fd4fff9eebca9f0c.zip | |
xorg.xserver: configure --with-xkb-path= (#21653)
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/bumblebee/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/X11/bumblebee/nixos.patch | 3 | ||||
| -rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/X11/xpra/gtk3.nix | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 0429faab2ef8..eac44efdf273 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -18,7 +18,7 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper , glib, libbsd -, libX11, libXext, xorgserver, xkbcomp, kmod, xkeyboard_config, xf86videonouveau +, libX11, libXext, xorgserver, xkbcomp, kmod, xf86videonouveau , nvidia_x11, virtualgl, primusLib , automake111x, autoconf # The below should only be non-null in a x86_64 system. On a i686 @@ -125,7 +125,6 @@ in stdenv.mkDerivation rec { CFLAGS = [ "-DX_MODULE_APPENDS=\\\"${xmodules}\\\"" - "-DX_XKB_DIR=\\\"${xkeyboard_config}/etc/X11/xkb\\\"" ]; postInstall = '' diff --git a/pkgs/tools/X11/bumblebee/nixos.patch b/pkgs/tools/X11/bumblebee/nixos.patch index 00fb8ad7a535..cf6ee5add98f 100644 --- a/pkgs/tools/X11/bumblebee/nixos.patch +++ b/pkgs/tools/X11/bumblebee/nixos.patch @@ -49,12 +49,11 @@ index 71a6b73..a682d8a 100644 char *x_argv[] = { XORG_BINARY, bb_config.x_display, -@@ -153,24 +170,25 @@ bool start_secondary(bool need_secondary) { +@@ -153,24 +170,24 @@ bool start_secondary(bool need_secondary) { "-sharevts", "-nolisten", "tcp", "-noreset", + "-logfile", "/var/log/X.bumblebee.log", -+ "-xkbdir", X_XKB_DIR, "-verbose", "3", "-isolateDevice", pci_id, - "-modulepath", bb_config.mod_path, // keep last diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 4ae367abf612..eadae7ad3c45 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, python2Packages, pkgconfig , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk -, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config +, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf , ffmpeg, x264, libvpx, libwebp , libfakeXinerama , gst_all_1, pulseaudioLight, gobjectIntrospection }: diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index a9ba93507364..f66b7389f315 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, buildPythonApplication , python, cython, pkgconfig , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection -, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config +, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf , ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: |