public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move gtkLibs3x to top-level namespace, gtk+-3.2.3 

Cherry-pick /nixpkgs/branches/glib-2.30@32044

svn path=/nixpkgs/trunk/; revision=32129
This commit is contained in:
Yury G. Kudryashov 2012-02-07 21:03:16 +00:00
parent acd9d6b42e
commit a8dba7888b
2 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/gtk+/3.2.x.nix
View File

@ -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 , gdk_pixbuf, xz
, xineramaSupport ? true , xineramaSupport ? true
, cupsSupport ? true, cups ? null , cupsSupport ? true, cups ? null
@ -8,12 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null; assert cupsSupport -> cups != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = src.pkgname; name = "gtk+-3.2.3";
src = fetchurl_gnome { src = fetchurl {
project = "gtk+"; url = mirror://gnome/sources/gtk+/3.2/gtk+-3.2.3.tar.xz;
major = "3"; minor = "2"; patchlevel = "0"; extension = "xz"; sha256 = "0g8x2kcqq17bccm4yszim837saj73zfk66ia2azcgfqfa7r21kz2";
sha256 = "0k6l5sw8njbnbapzm9v5jwlrrl7xv1b8c9lmqx97bzbapslw3qxw";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -21,14 +20,12 @@ stdenv.mkDerivation rec {
buildNativeInputs = [ perl pkgconfig xz ]; buildNativeInputs = [ perl pkgconfig xz ];
propagatedBuildInputs = 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 xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
] ]
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ]; ++ stdenv.lib.optionals cupsSupport [ cups ];
configureFlags = "--with-xinput=yes";
postInstall = "rm -rf $out/share/gtk-doc"; postInstall = "rm -rf $out/share/gtk-doc";
meta = { meta = {

27
pkgs/top-level/all-packages.nix
View File

@ -3731,32 +3731,15 @@ let
gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { }; 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 { };
gtk = pkgs.gtk2;
gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { }; gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { };
gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in { pango129 = lowPrio (callPackage ../development/libraries/pango/1.29.x.nix { });
glib = callPackage ../development/libraries/glib/2.30.x.nix { };
glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { }; gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { });
gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { };
atk = callPackage ../development/libraries/atk/2.2.x.nix { };
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 { };
gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { };
# Let hydra build gtk-3.x but do not show this to users yet
recurseForRelease = true;
};
gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
inherit (gnome) gtk; inherit (gnome) gtk;