diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index e8543444140..11d7a1e29f3 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto -, compat24 ? false, compat26 ? true, unicode ? true +, mesa, compat24 ? false, compat26 ? true, unicode ? true, }: assert pkgconfig != null && gtk != null; @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib - libXinerama libSM libXxf86vm xf86vidmodeproto + libXinerama libSM libXxf86vm xf86vidmodeproto mesa ]; configureFlags = [ @@ -27,17 +27,21 @@ stdenv.mkDerivation { (if compat26 then "--enable-compat26" else "--disable-compat26") "--disable-precomp-headers" (if unicode then "--enable-unicode" else "") + "--with-opengl" ]; # This variable is used by configure to find some dependencies. SEARCH_INCLUDE = "${libXinerama}/include ${libSM}/include ${libXxf86vm}/include"; + SEARCH_LIB = "${mesa}/lib"; + # Work around a bug in configure. NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1"; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' + substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' substituteInPlace configure --replace /usr /no-such-path "; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e18f2f8a57d..16fc9ffb2ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3846,7 +3846,7 @@ let wxGTK28fun = lib.sumArgs (import ../development/libraries/wxGTK-2.8); wxGTK28deps = wxGTK28fun { - inherit fetchurl stdenv pkgconfig; + inherit fetchurl stdenv pkgconfig mesa; inherit (gtkLibs) gtk; inherit (xlibs) libXinerama libSM libXxf86vm xf86vidmodeproto; };