Move gtkLibs3x to top-level namespace, gtk+-3.2.3 backups/glib-2.30@32938

svn path=/nixpkgs/branches/glib-2.30/; revision=32044

2 files changed, 11 insertions, 31 deletions

diff --git a/pkgs/development/libraries/gtk+/3.2.x.nix b/pkgs/development/libraries/gtk+/3.2.x.nix
index a72411d16367f..826fb81cf8751 100644
--- a/pkgs/development/libraries/gtk+/3.2.x.nix
+++ b/pkgs/development/libraries/gtk+/3.2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl_gnome, pkgconfig, glib, atk, pango, cairo, perl, xlibs
+{ stdenv, fetchurl, pkgconfig, glib, atk, pango129, cairo, perl, xlibs
 , gdk_pixbuf, xz
 , xineramaSupport ? true
 , cupsSupport ? true, cups ? null
@@ -8,12 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "gtk+-3.2.3";
 
-  src = fetchurl_gnome {
-    project = "gtk+";
-    major = "3"; minor = "2"; patchlevel = "0"; extension = "xz";
-    sha256 = "0k6l5sw8njbnbapzm9v5jwlrrl7xv1b8c9lmqx97bzbapslw3qxw";
+  src = fetchurl {
+    url = mirror://gnome/sources/gtk+/3.2/gtk+-3.2.3.tar.xz;
+    sha256 = "0g8x2kcqq17bccm4yszim837saj73zfk66ia2azcgfqfa7r21kz2";
   };
 
   enableParallelBuilding = true;
@@ -21,14 +20,12 @@ stdenv.mkDerivation rec {
   buildNativeInputs = [ perl pkgconfig xz ];
 
   propagatedBuildInputs =
-    [ xlibs.xlibs glib atk pango gdk_pixbuf cairo
+    [ xlibs.xlibs glib atk pango129 gdk_pixbuf cairo
       xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
     ]
     ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
     ++ stdenv.lib.optionals cupsSupport [ cups ];
 
-  configureFlags = "--with-xinput=yes";
-
   postInstall = "rm -rf $out/share/gtk-doc";
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af7cd1e44dc38..86689123f7bf8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3731,32 +3731,15 @@ let
 
   gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { };
 
-  gtk = callPackage ../development/libraries/gtk+/2.24.x.nix { };
+  gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { };
 
-  gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { };
-
-  gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in {
-    glib = callPackage ../development/libraries/glib/2.30.x.nix { };
-
-    glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };
-
-    gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { };
-
-    atk = callPackage ../development/libraries/atk/2.2.x.nix { };
+  gtk = pkgs.gtk2;
 
-    atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { };
-
-    cairo = callPackage ../development/libraries/cairo { };
-
-    pango = callPackage ../development/libraries/pango/1.29.x.nix { };
-
-    gtk = callPackage ../development/libraries/gtk+/3.2.x.nix { };
+  gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { };
 
-    gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { };
+  pango129 = lowPrio (callPackage ../development/libraries/pango/1.29.x.nix { });
 
-    # Let hydra build gtk-3.x but do not show this to users yet
-    recurseForRelease = true;
-  };
+  gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { });
 
   gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
     inherit (gnome) gtk;