3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch
Eelco Dolstra fc483e0d57 * 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-29 22:57:56 +00:00

16 lines
500 B
Diff

diff -rc xorg-server-X11R7.2-1.2.0-orig/xkb/xkbInit.c xorg-server-X11R7.2-1.2.0/xkb/xkbInit.c
*** xorg-server-X11R7.2-1.2.0-orig/xkb/xkbInit.c Tue Jan 23 04:13:16 2007
--- xorg-server-X11R7.2-1.2.0/xkb/xkbInit.c Fri Mar 30 00:52:53 2007
***************
*** 923,928 ****
--- 923,931 ----
XkbDfltRepeatInterval = (long)atoi(argv[i]);
return 2;
}
+ char *xkbBinDir = getenv("XKB_BINDIR");
+ if (xkbBinDir)
+ XkbBinDirectory = _XkbDupString(xkbBinDir);
return 0;
}