b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

wxGTK-2.9: updated the development version of wxGTK to 2.9.3

Browse source 
I deleted older snapshots because my attempts to use 2.9.0 or 2.9.1 ran into
problems with our recent version of libpng. The 2.9.3 version seems to work
fine, though. If you still need the older versions, please feel free to
reinstate them.

svn path=/nixpkgs/trunk/; revision=33812
This commit is contained in:
Peter Simons 2012-04-17 13:56:30 +00:00
parent eec2c680c7
commit 39c9ece183
4 changed files with 6 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
View file

@ -1,47 +0,0 @@
{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, gstreamer, gst_plugins_base, GConf
, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
}:
assert withMesa -> mesa != null;
with stdenv.lib;
stdenv.mkDerivation {
name = "wxwidgets-2.9.1";
src = fetchurl {
url = mirror://sourceforge/wxwindows/wxWidgets-2.9.1.tar.bz2;
sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8";
};
buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ]
++ optional withMesa mesa;
buildNativeInputs = [ pkgconfig ];
configureFlags = [
"--enable-gtk2"
(if compat24 then "--enable-compat24" else "--disable-compat24")
(if compat26 then "--enable-compat26" else "--disable-compat26")
"--disable-precomp-headers"
(if unicode then "--enable-unicode" else "")
"--enable-mediactrl"
] ++ optional withMesa "--with-opengl";
SEARCH_LIB = optionalString withMesa "${mesa}/lib";
preConfigure = "
substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
substituteInPlace configure --replace /usr /no-such-path
";
postInstall = "
(cd $out/include && ln -s wx-*/* .)
";
passthru = {inherit gtk compat24 compat26 unicode;};
enableParallelBuilding = true;
}

6
pkgs/development/libraries/wxGTK-2.9/2.9.0.nix → pkgs/development/libraries/wxGTK-2.9/default.nix
View file

@ -8,11 +8,11 @@ assert withMesa -> mesa != null;
with stdenv.lib;
stdenv.mkDerivation {
name = "wxwidgets-2.9.0";
name = "wxwidgets-2.9.3";
src = fetchurl {
url = mirror://sourceforge/wxwindows/wxWidgets-2.9.0.tar.bz2;
sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc";
url = "mirror://sourceforge/wxwindows/wxWidgets-2.9.3.tar.bz2";
sha256 = "739c31a360b5c46b55904a7fb086f5cdfff0816efbc491d8263349210bf323b2";
};
buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ]

4
pkgs/games/rigsofrods/default.nix
View file

@ -1,4 +1,4 @@
{ fetchsvn, fetchurl, stdenv, wxGTK290, freeimage, cmake, zziplib, mesa, boost,
{ fetchsvn, fetchurl, stdenv, wxGTK29, freeimage, cmake, zziplib, mesa, boost,
pkgconfig, libuuid, openal, ogre, ois, curl, gtk, pixman, mygui, unzip,
angelscript, caelum, ogrepaged, mysocketw, libxcb
}:
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
patches = [ ./doubleslash.patch ./paths.patch ];
buildInputs = [ wxGTK290 freeimage cmake zziplib mesa boost pkgconfig
buildInputs = [ wxGTK29 freeimage cmake zziplib mesa boost pkgconfig
libuuid openal ogre ois curl gtk mygui unzip angelscript
caelum ogrepaged mysocketw libxcb ];

7
pkgs/top-level/all-packages.nix
View file

@ -4858,12 +4858,7 @@ let
withMesa = lib.elem system lib.platforms.mesaPlatforms;
};
wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix {
inherit (gnome) GConf;
withMesa = lib.elem system lib.platforms.mesaPlatforms;
};
wxGTK291 = callPackage ../development/libraries/wxGTK-2.9/2.9.1.nix {
wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix {
inherit (gnome) GConf;
withMesa = lib.elem system lib.platforms.mesaPlatforms;
};