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. svn path=/nixpkgs/trunk/; revision=32040
This commit is contained in:
parent
06a8db81ca
commit
c81e27f1f7
|
@ -3038,6 +3038,8 @@ let
|
||||||
gnumake380 = callPackage ../development/tools/build-managers/gnumake-3.80 { };
|
gnumake380 = callPackage ../development/tools/build-managers/gnumake-3.80 { };
|
||||||
gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81.nix { };
|
gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81.nix { };
|
||||||
|
|
||||||
|
gob2 = callPackage ../development/tools/misc/gob2 { };
|
||||||
|
|
||||||
gradle = callPackage ../development/tools/build-managers/gradle { };
|
gradle = callPackage ../development/tools/build-managers/gradle { };
|
||||||
|
|
||||||
gperf = callPackage ../development/tools/misc/gperf { };
|
gperf = callPackage ../development/tools/misc/gperf { };
|
||||||
|
@ -3708,36 +3710,31 @@ let
|
||||||
|
|
||||||
gtkmathview = callPackage ../development/libraries/gtkmathview { };
|
gtkmathview = callPackage ../development/libraries/gtkmathview { };
|
||||||
|
|
||||||
gtkLibs = recurseIntoAttrs pkgs.gtkLibs224;
|
gtkLibs = {
|
||||||
|
inherit (pkgs) glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtk
|
||||||
inherit (pkgs.gtkLibs) glib gtk pango cairo gdk_pixbuf;
|
gtkmm;
|
||||||
|
|
||||||
gtkLibs224 = let callPackage = pkgs.newScope pkgs.gtkLibs224; in {
|
|
||||||
|
|
||||||
glib = callPackage ../development/libraries/glib/2.28.x.nix { };
|
|
||||||
|
|
||||||
glibmm = callPackage ../development/libraries/glibmm/2.28.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.28.x.nix { };
|
|
||||||
|
|
||||||
pangomm = callPackage ../development/libraries/pangomm/2.28.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 { };
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
glib = callPackage ../development/libraries/glib/2.28.x.nix { };
|
||||||
|
|
||||||
|
glibmm = callPackage ../development/libraries/glibmm/2.28.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.28.x.nix { };
|
||||||
|
|
||||||
|
pangomm = callPackage ../development/libraries/pangomm/2.28.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 { };
|
||||||
|
|
||||||
gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in {
|
gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in {
|
||||||
glib = callPackage ../development/libraries/glib/2.30.x.nix { };
|
glib = callPackage ../development/libraries/glib/2.30.x.nix { };
|
||||||
|
|
||||||
|
@ -6923,7 +6920,7 @@ let
|
||||||
gitSVN = gitAndTools.gitSVN;
|
gitSVN = gitAndTools.gitSVN;
|
||||||
|
|
||||||
giv = callPackage ../applications/graphics/giv {
|
giv = callPackage ../applications/graphics/giv {
|
||||||
inherit (gtkLibs) gdk_pixbuf gtk gob2;
|
inherit (gtkLibs) gdk_pixbuf gtk;
|
||||||
pcre = pcre.override { unicodeSupport = true; };
|
pcre = pcre.override { unicodeSupport = true; };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue