Author: simons
Date: Tue Apr 17 13:56:30 2012
New Revision: 33812
URL: https://nixos.org/websvn/nix/?rev=33812&sc=1
Log:
wxGTK-2.9: updated the development version of wxGTK to 2.9.3
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.
Added:
nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.9/default.nix
- copied, changed from r33811,
nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix
nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix
Modified:
nixpkgs/trunk/pkgs/games/rigsofrods/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.9/default.nix (from r33811,
nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix Tue Apr
17 13:56:27 2012 (r33811, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/wxGTK-2.9/default.nix Tue Apr
17 13:56:30 2012 (r33812)
@@ -8,11 +8,11 @@
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 ]
Modified: nixpkgs/trunk/pkgs/games/rigsofrods/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/games/rigsofrods/default.nix Tue Apr 17 13:56:27
2012 (r33811)
+++ nixpkgs/trunk/pkgs/games/rigsofrods/default.nix Tue Apr 17 13:56:30
2012 (r33812)
@@ -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 @@
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 ];
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Apr 17 13:56:27
2012 (r33811)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Apr 17 13:56:30
2012 (r33812)
@@ -4858,12 +4858,7 @@
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;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
