* Use wxGTK 2.5 by default (since it works with the latest gtk, and is

  probably stable enough).
* Supply installable gcc 3.4.

svn path=/nixpkgs/trunk/; revision=1483

1 files changed, 18 insertions, 3 deletions

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index af759af8a90..f14bccc22cc 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -251,6 +251,14 @@ rec {
     profiledCompiler = gccWithProfiling;
   };
 
+  gccWrapped = (import ../build-support/gcc-wrapper) {
+    nativeTools = false;
+    nativeGlibc = false;
+    gcc = stdenv.gcc;
+    inherit (stdenv.gcc) binutils glibc;
+    inherit stdenv;
+  };
+
   gcc_static = (import ../stdenv/nix-linux/gcc-static) {
     inherit fetchurl stdenv;
   };
@@ -553,11 +561,18 @@ rec {
 
   gnome = import ../development/libraries/gnome {
     inherit fetchurl stdenv pkgconfig audiofile
-            flex bison popt perl zlib libxml2 bzip2;
+            flex bison popt perl zlib libxml2 bzip2
+            perlXMLParser;
     gtkLibs = gtkLibs22;
   };
 
-  wxGTK = (import ../development/libraries/wxGTK) {
+  wxGTK = (import ../development/libraries/wxGTK-2.5) {
+    inherit fetchurl stdenv pkgconfig;
+    inherit (gtkLibs) gtk;
+    inherit (xlibs) libXinerama;
+  };
+
+  wxGTK24 = (import ../development/libraries/wxGTK) {
     inherit fetchurl stdenv pkgconfig;
     inherit (gtkLibs22) gtk;
   };
@@ -780,7 +795,7 @@ rec {
   };
 
   vlc = (import ../applications/video/vlc) {
-    inherit fetchurl stdenv wxGTK libdvdcss libdvdplay
+    inherit fetchurl stdenv libdvdcss wxGTK libdvdplay
             mpeg2dec a52dec libmad x11;
     inherit (xlibs) libXv;
     alsa = alsaLib;