Author: urkud Date: Sun Feb 5 18:29:42 2012 New Revision: 32040 URL: https://nixos.org/websvn/nix/?rev=32040&sc=1
Log: Move gtkLibs to top-level namespace Earlier there was a strict correspondence between versions of gtkLibs.* but now upstream moves to gtk-3.x, and there is no simple rule anymore. Thus it is easier to override particular libs on a case-by-case basis than using gtkLibs2x. Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Feb 5 09:26:15 2012 (r32039) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Feb 5 18:29:42 2012 (r32040) @@ -3038,6 +3038,8 @@ gnumake380 = callPackage ../development/tools/build-managers/gnumake-3.80 { }; gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81.nix { }; + gob2 = callPackage ../development/tools/misc/gob2 { }; + gradle = callPackage ../development/tools/build-managers/gradle { }; gperf = callPackage ../development/tools/misc/gperf { }; @@ -3708,35 +3710,30 @@ gtkmathview = callPackage ../development/libraries/gtkmathview { }; - gtkLibs = recurseIntoAttrs pkgs.gtkLibs224; + gtkLibs = { + inherit (pkgs) glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtk + gtkmm; + }; - inherit (pkgs.gtkLibs) glib gtk pango cairo gdk_pixbuf; + glib = callPackage ../development/libraries/glib/2.28.x.nix { }; - gtkLibs224 = let callPackage = pkgs.newScope pkgs.gtkLibs224; in { + glibmm = callPackage ../development/libraries/glibmm/2.28.x.nix { }; - glib = callPackage ../development/libraries/glib/2.28.x.nix { }; + atk = callPackage ../development/libraries/atk/2.2.x.nix { }; - glibmm = callPackage ../development/libraries/glibmm/2.28.x.nix { }; + atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; - atk = callPackage ../development/libraries/atk/2.2.x.nix { }; + cairo = callPackage ../development/libraries/cairo { }; - atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; + pango = callPackage ../development/libraries/pango/1.28.x.nix { }; - cairo = callPackage ../development/libraries/cairo { }; + pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { }; - pango = callPackage ../development/libraries/pango/1.28.x.nix { }; + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { }; - pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { }; + gtk = callPackage ../development/libraries/gtk+/2.24.x.nix { }; - gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { }; - - gtk = callPackage ../development/libraries/gtk+/2.24.x.nix { }; - - gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { }; - - gob2 = callPackage ../development/tools/misc/gob2 { }; - - }; + 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 { }; @@ -6923,7 +6920,7 @@ gitSVN = gitAndTools.gitSVN; giv = callPackage ../applications/graphics/giv { - inherit (gtkLibs) gdk_pixbuf gtk gob2; + inherit (gtkLibs) gdk_pixbuf gtk; pcre = pcre.override { unicodeSupport = true; }; }; _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits