diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix deleted file mode 100644 index d59ab4880c3..00000000000 --- a/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix +++ /dev/null @@ -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; -} diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix similarity index 87% rename from pkgs/development/libraries/wxGTK-2.9/2.9.0.nix rename to pkgs/development/libraries/wxGTK-2.9/default.nix index 619806fb7b2..a0e69bff0fe 100644 --- a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -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 ] diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index f92b5775ab7..90ebab92942 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b177291e95b..f7f2438208a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; };