diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2017-12-18 02:18:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-18 02:18:42 +0100 |
commit | 0a8b47d709a865d34025127aaf4c9666cb913dab (patch) | |
tree | 086e56213a659bf8148117dc2fba73e8e5ecb362 /pkgs/top-level | |
parent | 7bd04329a0f6e91fa9fe7e8da4a7a587b11ec54f (diff) | |
parent | cfcb02214efccc1c4bdc5730b2b69f1b2953d395 (diff) | |
download | nixlib-0a8b47d709a865d34025127aaf4c9666cb913dab.tar nixlib-0a8b47d709a865d34025127aaf4c9666cb913dab.tar.gz nixlib-0a8b47d709a865d34025127aaf4c9666cb913dab.tar.bz2 nixlib-0a8b47d709a865d34025127aaf4c9666cb913dab.tar.lz nixlib-0a8b47d709a865d34025127aaf4c9666cb913dab.tar.xz nixlib-0a8b47d709a865d34025127aaf4c9666cb913dab.tar.zst nixlib-0a8b47d709a865d34025127aaf4c9666cb913dab.zip |
Merge pull request #32749 from jtojnar/gnome-gtk2-cleanup
Minor GNOME cleanups
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10b8d72bb168..ff3600dc4492 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9019,13 +9019,12 @@ with pkgs; inherit (xlibs) libX11 libXext; }; - libcanberra_gtk3 = callPackage ../development/libraries/libcanberra { - gtk = pkgs.gtk3; - }; + libcanberra = callPackage ../development/libraries/libcanberra { }; + libcanberra_gtk3 = pkgs.libcanberra.override { gtk = pkgs.gtk3; }; libcanberra_gtk2 = pkgs.libcanberra_gtk3.override { gtk = pkgs.gtk2; }; libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true) - then pkgs.libcanberra_gtk2.override { gtk = null; } + then pkgs.libcanberra else pkgs.libcanberra_gtk2; libcec = callPackage ../development/libraries/libcec { }; @@ -18477,14 +18476,13 @@ with pkgs; } // { inherit (pkgs) # GTK Libs - glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 + glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra_gtk2 # Included for backwards compatibility libsoup libwnck gtk_doc gnome_doc_utils; gtk = self.gtk2; gtkmm = self.gtkmm2; - libcanberra = self.libcanberra_gtk2; }); gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); |