diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-01-24 21:00:53 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-01-24 21:00:53 +0000 |
| commit | 50d8df47b297a973c8f10e7b6797b8d4ba28e15d (patch) | |
| tree | 79da1d37d24b11052a03655fb0c88dcb6766fde8 /pkgs | |
| parent | 5a9098ea3619b48928903fbb8baf397a9b2406f9 (diff) | |
| download | nixlib-50d8df47b297a973c8f10e7b6797b8d4ba28e15d.tar nixlib-50d8df47b297a973c8f10e7b6797b8d4ba28e15d.tar.gz nixlib-50d8df47b297a973c8f10e7b6797b8d4ba28e15d.tar.bz2 nixlib-50d8df47b297a973c8f10e7b6797b8d4ba28e15d.tar.lz nixlib-50d8df47b297a973c8f10e7b6797b8d4ba28e15d.tar.xz nixlib-50d8df47b297a973c8f10e7b6797b8d4ba28e15d.tar.zst nixlib-50d8df47b297a973c8f10e7b6797b8d4ba28e15d.zip | |
Making wxGTK-2.8 to provide wxGLCanvas. Adding dependence on mesa.
svn path=/nixpkgs/trunk/; revision=13831
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/wxGTK-2.8/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index e8543444140a..11d7a1e29f35 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 e18f2f8a57d4..16fc9ffb2ba5 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; }; |