public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wxGTK: make mesa support optional in versions 2.9.0 and 2.9.1 too

Browse Source 
svn path=/nixpkgs/trunk/; revision=33069
This commit is contained in:
Peter Simons 2012-03-14 17:45:11 +00:00
parent 7ccc8fc78f
commit f59e3b6bfb
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
View File

@ -1,8 +1,12 @@
{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, gstreamer, gstPluginsBase, GConf , gstreamer, gstPluginsBase, GConf
, mesa, compat24 ? false, compat26 ? true, unicode ? true, , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
}: }:
assert withMesa -> mesa != null;
with stdenv.lib;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "wxwidgets-2.9.0"; name = "wxwidgets-2.9.0";
@ -11,7 +15,8 @@ stdenv.mkDerivation {
sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc"; sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc";
}; };
buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa gstreamer gstPluginsBase GConf ]; buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gstPluginsBase GConf ]
++ optional withMesa mesa;
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];
@ -21,11 +26,10 @@ 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"
"--enable-mediactrl" "--enable-mediactrl"
]; ] ++ optional withMesa "--with-opengl";
SEARCH_LIB = "${mesa}/lib"; SEARCH_LIB = optionalString withMesa "${mesa}/lib";
preConfigure = " preConfigure = "
substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='

14
pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
View File

@ -1,8 +1,12 @@
{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, gstreamer, gstPluginsBase, GConf , gstreamer, gstPluginsBase, GConf
, mesa, compat24 ? false, compat26 ? true, unicode ? true, , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
}: }:
assert withMesa -> mesa != null;
with stdenv.lib;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "wxwidgets-2.9.1"; name = "wxwidgets-2.9.1";
@ -11,7 +15,8 @@ stdenv.mkDerivation {
sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8"; sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8";
}; };
buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa gstreamer gstPluginsBase GConf ]; buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gstPluginsBase GConf ]
++ optional withMesa mesa;
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];
@ -21,11 +26,10 @@ 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"
"--enable-mediactrl" "--enable-mediactrl"
]; ] ++ optional withMesa "--with-opengl";
SEARCH_LIB = "${mesa}/lib"; SEARCH_LIB = optionalString withMesa "${mesa}/lib";
preConfigure = " preConfigure = "
substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='