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

*** xorg-server-X11R7.2-1.2.0-orig/xkb/xkbInit.c	2015-02-11 00:32:06.000000000 +0100
--- xorg-server-X11R7.2-1.2.0/xkb/xkbInit.c	2015-04-11 10:10:41.948438435 +0200
***************
*** 733,738 ****
--- 733,742 ----
  int
  XkbProcessArguments(int argc, char *argv[], int i)
  {
+     char *xkbBinDir = getenv("XKB_BINDIR");
+     if (xkbBinDir)
+         XkbBinDirectory = Xstrdup(xkbBinDir);
+ 
      if (strncmp(argv[i], "-xkbdir", 7) == 0) {
          if (++i < argc) {
  #if !defined(WIN32) && !defined(__CYGWIN__)
xorg: fix Xephyr 2015-04-11 11:25:02 +02:00			`*** xorg-server-X11R7.2-1.2.0-orig/xkb/xkbInit.c 2015-02-11 00:32:06.000000000 +0100`
			`--- xorg-server-X11R7.2-1.2.0/xkb/xkbInit.c 2015-04-11 10:10:41.948438435 +0200`
* Allow the path to xkbcomp to specified in an environment variable. The X server by default looks for it under its own prefix, which isn't right. Not being able to run xkbcomp causes the Xkb keyboard extension to fail (which incidentally is also the reason why Ctrl-Alt-Fn didn't work). svn path=/nixpkgs/trunk/; revision=8494 2007-03-30 00:57:56 +02:00			`***************`
xorg: fix Xephyr 2015-04-11 11:25:02 +02:00			`* 733,738 **`
			`--- 733,742 ----`
			`int`
			`XkbProcessArguments(int argc, char *argv[], int i)`
			`{`
* Allow the path to xkbcomp to specified in an environment variable. The X server by default looks for it under its own prefix, which isn't right. Not being able to run xkbcomp causes the Xkb keyboard extension to fail (which incidentally is also the reason why Ctrl-Alt-Fn didn't work). svn path=/nixpkgs/trunk/; revision=8494 2007-03-30 00:57:56 +02:00			`+ char *xkbBinDir = getenv("XKB_BINDIR");`
			`+ if (xkbBinDir)`
xorgserver: Update xkbcomp-path patch _XkbDupString was migrated to Xstrdup 2012-07-14 21:13:08 +02:00			`+ XkbBinDirectory = Xstrdup(xkbBinDir);`
xorg: fix Xephyr 2015-04-11 11:25:02 +02:00			`+`
			`if (strncmp(argv[i], "-xkbdir", 7) == 0) {`
			`if (++i < argc) {`
			`#if !defined(WIN32) && !defined(__CYGWIN__)`