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

gtkLibs: remove by inlining into gnome2 (close #16665)

Browse Source 
vcunat reverted gtk -> gtk2 change.
This commit is contained in:
Ryan Scheel (Havvy) 2016-07-02 12:06:40 +00:00 committed by Vladimír Čunát
parent def310df45
commit fe01f1c66b
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7366,11 +7366,6 @@ in
gtkmathview = callPackage ../development/libraries/gtkmathview { }; gtkmathview = callPackage ../development/libraries/gtkmathview { };
gtkLibs = {
inherit (pkgs) glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtk
gtkmm;
};
glib = callPackage ../development/libraries/glib { }; glib = callPackage ../development/libraries/glib { };
glib-tested = self.glib.override { # checked version separate to break cycles glib-tested = self.glib.override { # checked version separate to break cycles
doCheck = true; doCheck = true;
@ -15741,9 +15736,13 @@ in
gnome2 = callPackage ../desktops/gnome-2 { gnome2 = callPackage ../desktops/gnome-2 {
callPackage = pkgs.newScope pkgs.gnome2; callPackage = pkgs.newScope pkgs.gnome2;
self = pkgs.gnome2; self = pkgs.gnome2;
} // pkgs.gtkLibs // { } // {
# Backwards compatibility; inherit (pkgs)
inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; # GTK Libs
glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtk gtkmm
# Included for backwards compatibility
libsoup libwnck gtk_doc gnome_doc_utils;
}; };
gnome3_18 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.18 { }); gnome3_18 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.18 { });