diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2007-03-05 18:28:49 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2007-03-05 18:28:49 +0000 |
| commit | fb6d590e50eb6a863fe31385218525ce002e7cde (patch) | |
| tree | f99e2b9867cf06b2f2158b1217fbacd2899a051e /pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | |
| parent | 3b1d307518a9c36a77f1f18ed8ed0b1c2bfac91a (diff) | |
| download | nixlib-fb6d590e50eb6a863fe31385218525ce002e7cde.tar nixlib-fb6d590e50eb6a863fe31385218525ce002e7cde.tar.gz nixlib-fb6d590e50eb6a863fe31385218525ce002e7cde.tar.bz2 nixlib-fb6d590e50eb6a863fe31385218525ce002e7cde.tar.lz nixlib-fb6d590e50eb6a863fe31385218525ce002e7cde.tar.xz nixlib-fb6d590e50eb6a863fe31385218525ce002e7cde.tar.zst nixlib-fb6d590e50eb6a863fe31385218525ce002e7cde.zip | |
xorg libxcb: patch to disable assert that stops Java GUI apps from
working (the actual bug is in Java). svn path=/nixpkgs/trunk/; revision=8189
Diffstat (limited to 'pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl')
| -rwxr-xr-x | pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index e2ac2ac492d5..7d3a117be339 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -44,6 +44,10 @@ $extraAttrs{"xorgserver"} = " mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh $extraAttrs{"imake"} = " inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; "; +# Used to avoid the following assertion error: +# java: xcb_xlib.c:50: xcb_xlib_unlock: Assertion `c->xlib.lock' failed. +$extraAttrs{"libxcb"} = " patches = [./xcb_xlib-no-assert-on-lock.patch]; "; + $extraAttrs{"fontmiscmisc"} = " postInstall = \"ln -s \${fontalias}/lib/X11/fonts/misc/fonts.alias \$out/lib/X11/fonts/misc/fonts.alias\"; "; $extraAttrs{"mkfontdir"} = " preBuild = \"substituteInPlace mkfontdir.cpp --replace BINDIR \${mkfontscale}/bin\"; "; |