diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af7cd1e44dc38..86689123f7bf8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3731,32 +3731,15 @@ let 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 { }; - 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 { }; - - glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { }; - - gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { }; - - atk = callPackage ../development/libraries/atk/2.2.x.nix { }; + gtk = pkgs.gtk2; - 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 { }; + gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { }; - gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { }; + pango129 = lowPrio (callPackage ../development/libraries/pango/1.29.x.nix { }); - # Let hydra build gtk-3.x but do not show this to users yet - recurseForRelease = true; - }; + gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { }); gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { inherit (gnome) gtk; |