diff options
| author | Ryan Scheel (Havvy) <ryan.havvy@gmail.com> | 2016-07-02 12:06:40 +0000 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-07-03 07:53:43 +0200 |
| commit | fe01f1c66ba3fd962187c1f4d30b992ae6016ee7 (patch) | |
| tree | 60d84dda9ed78abde813ce71155641f8aab0e849 | |
| parent | def310df459f649a4ce2df8b7ba19aa8e4d5af58 (diff) | |
| download | nixlib-fe01f1c66ba3fd962187c1f4d30b992ae6016ee7.tar nixlib-fe01f1c66ba3fd962187c1f4d30b992ae6016ee7.tar.gz nixlib-fe01f1c66ba3fd962187c1f4d30b992ae6016ee7.tar.bz2 nixlib-fe01f1c66ba3fd962187c1f4d30b992ae6016ee7.tar.lz nixlib-fe01f1c66ba3fd962187c1f4d30b992ae6016ee7.tar.xz nixlib-fe01f1c66ba3fd962187c1f4d30b992ae6016ee7.tar.zst nixlib-fe01f1c66ba3fd962187c1f4d30b992ae6016ee7.zip | |
gtkLibs: remove by inlining into gnome2 (close #16665)
vcunat reverted gtk -> gtk2 change.
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0606ceef866a..2ec015293172 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7366,11 +7366,6 @@ in 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-tested = self.glib.override { # checked version separate to break cycles doCheck = true; @@ -15741,9 +15736,13 @@ in gnome2 = callPackage ../desktops/gnome-2 { callPackage = pkgs.newScope pkgs.gnome2; self = pkgs.gnome2; - } // pkgs.gtkLibs // { - # Backwards compatibility; - inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; + } // { + inherit (pkgs) + # 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 { }); |