nixpkgs/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch

diff --git a/os/utils.c b/os/utils.c
index ed7581e..6593455 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -658,6 +658,10 @@ ProcessCommandLine(int argc, char *argv[])
 
     defaultKeyboardControl.autoRepeat = TRUE;
 
+    char *xkbBinDir = getenv("XKB_BINDIR");
+    if (xkbBinDir)
+        XkbBinDirectory = Xstrdup(xkbBinDir);
+
 #ifdef NO_PART_NET
     PartialNetwork = FALSE;
 #else
xorg-server: fix XKB_BINDIR usage (close #8993) Previously, XKB_BINDIR was read inside a loop over the program arguments, so was only read if it had arguments that weren't matched by the first some number of checks. 2015-07-26 02:39:36 +02:00			`diff --git a/os/utils.c b/os/utils.c`
			`index ed7581e..6593455 100644`
			`--- a/os/utils.c`
			`+++ b/os/utils.c`
			`@@ -658,6 +658,10 @@ ProcessCommandLine(int argc, char *argv[])`

			`defaultKeyboardControl.autoRepeat = TRUE;`

			`+ char *xkbBinDir = getenv("XKB_BINDIR");`
			`+ if (xkbBinDir)`
			`+ XkbBinDirectory = Xstrdup(xkbBinDir);`
			`+`
			`#ifdef NO_PART_NET`
			`PartialNetwork = FALSE;`
			`#else`