ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

Making wxGTK-2.8 to provide wxGLCanvas. Adding dependence on mesa.

Browse Source 
svn path=/nixpkgs/trunk/; revision=13831
This commit is contained in:
Lluís Batlle i Rossell 2009-01-24 21:00:53 +00:00
parent 5a9098ea36
commit 50d8df47b2
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/wxGTK-2.8/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto { 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; assert pkgconfig != null && gtk != null;
@ -18,7 +18,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib
libXinerama libSM libXxf86vm xf86vidmodeproto libXinerama libSM libXxf86vm xf86vidmodeproto mesa
]; ];
configureFlags = [ configureFlags = [
@ -27,17 +27,21 @@ stdenv.mkDerivation {
(if compat26 then "--enable-compat26" else "--disable-compat26") (if compat26 then "--enable-compat26" else "--disable-compat26")
"--disable-precomp-headers" "--disable-precomp-headers"
(if unicode then "--enable-unicode" else "") (if unicode then "--enable-unicode" else "")
"--with-opengl"
]; ];
# This variable is used by configure to find some dependencies. # This variable is used by configure to find some dependencies.
SEARCH_INCLUDE = SEARCH_INCLUDE =
"${libXinerama}/include ${libSM}/include ${libXxf86vm}/include"; "${libXinerama}/include ${libSM}/include ${libXxf86vm}/include";
SEARCH_LIB = "${mesa}/lib";
# Work around a bug in configure. # Work around a bug in configure.
NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1"; NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1";
preConfigure = " preConfigure = "
substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
substituteInPlace configure --replace /usr /no-such-path substituteInPlace configure --replace /usr /no-such-path
"; ";

2
pkgs/top-level/all-packages.nix
View File

@ -3846,7 +3846,7 @@ let
wxGTK28fun = lib.sumArgs (import ../development/libraries/wxGTK-2.8); wxGTK28fun = lib.sumArgs (import ../development/libraries/wxGTK-2.8);
wxGTK28deps = wxGTK28fun { wxGTK28deps = wxGTK28fun {
inherit fetchurl stdenv pkgconfig; inherit fetchurl stdenv pkgconfig mesa;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (xlibs) libXinerama libSM libXxf86vm xf86vidmodeproto; inherit (xlibs) libXinerama libSM libXxf86vm xf86vidmodeproto;
}; };