From 606ceda352de9830cc5e01c169571e742d88fb15 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Feb 2019 22:47:50 +0100 Subject: [PATCH] gnome3: stop using aliases --- .../services/x11/desktop-managers/xfce.nix | 2 +- .../display-managers/lightdm-greeters/gtk.nix | 8 +-- pkgs/applications/audio/audacious/default.nix | 2 +- .../audio/cozy-audiobooks/default.nix | 2 +- pkgs/applications/audio/easytag/default.nix | 2 +- pkgs/applications/audio/gpodder/default.nix | 2 +- pkgs/applications/audio/gtkpod/default.nix | 2 +- .../audio/pavucontrol/default.nix | 2 +- pkgs/applications/audio/quodlibet/default.nix | 2 +- pkgs/applications/audio/rhythmbox/default.nix | 2 +- pkgs/applications/audio/sonata/default.nix | 2 +- .../audio/sound-juicer/default.nix | 2 +- .../applications/editors/bluefish/default.nix | 2 +- .../editors/gnome-latex/default.nix | 6 +- .../applications/graphics/avocode/default.nix | 2 +- pkgs/applications/graphics/gthumb/default.nix | 7 +- .../graphics/shotwell/default.nix | 2 +- .../graphics/synfigstudio/default.nix | 4 +- pkgs/applications/graphics/vimiv/default.nix | 4 +- .../misc/font-manager/default.nix | 2 +- .../misc/gnome-recipes/default.nix | 4 +- .../applications/misc/gnome-usage/default.nix | 2 +- pkgs/applications/misc/gummi/default.nix | 2 +- pkgs/applications/misc/pcmanfm/default.nix | 2 +- pkgs/applications/misc/safeeyes/default.nix | 2 +- pkgs/applications/misc/tootle/default.nix | 4 +- .../networking/browsers/brave/default.nix | 2 +- .../networking/browsers/chromium/default.nix | 2 +- .../browsers/firefox-bin/default.nix | 4 +- .../networking/browsers/firefox/wrapper.nix | 2 +- .../browsers/google-chrome/default.nix | 2 +- .../networking/browsers/midori/default.nix | 4 +- .../tor-browser-bundle-bin/default.nix | 4 +- .../feedreaders/feedreader/default.nix | 6 +- .../networking/ftp/taxi/default.nix | 4 +- .../instant-messengers/coyim/default.nix | 4 +- .../instant-messengers/dino/default.nix | 6 +- .../instant-messengers/ekiga/default.nix | 2 +- .../instant-messengers/gajim/default.nix | 4 +- .../mailreaders/astroid/default.nix | 11 +-- .../mailreaders/mailnag/default.nix | 2 +- .../mailreaders/thunderbird-bin/default.nix | 4 +- .../mailreaders/thunderbird/default.nix | 2 +- .../networking/remote/remmina/default.nix | 4 +- .../networking/weather/meteo/default.nix | 4 +- pkgs/applications/office/abiword/default.nix | 4 +- pkgs/applications/office/gnumeric/default.nix | 2 +- pkgs/applications/office/grisbi/default.nix | 2 +- pkgs/applications/office/homebank/default.nix | 2 +- .../office/libreoffice/default.nix | 4 +- .../applications/office/libreoffice/still.nix | 4 +- .../applications/office/paperwork/default.nix | 4 +- pkgs/applications/office/tryton/default.nix | 2 +- .../science/math/nasc/default.nix | 6 +- .../science/math/wxmaxima/default.nix | 2 +- .../version-management/meld/default.nix | 2 +- pkgs/applications/video/pitivi/default.nix | 2 +- pkgs/applications/video/screenkey/default.nix | 4 +- .../virtualization/open-vm-tools/default.nix | 4 +- .../virtualization/virt-manager/default.nix | 2 +- .../gnome-3/apps/accerciser/default.nix | 2 +- .../gnome-3/apps/evolution/default.nix | 20 +++--- .../gnome-3/apps/file-roller/default.nix | 4 +- pkgs/desktops/gnome-3/apps/gedit/default.nix | 9 +-- pkgs/desktops/gnome-3/apps/ghex/default.nix | 15 +++-- pkgs/desktops/gnome-3/apps/glade/default.nix | 2 +- .../gnome-3/apps/gnome-boxes/default.nix | 2 +- .../gnome-3/apps/gnome-calendar/default.nix | 6 +- .../gnome-3/apps/gnome-characters/default.nix | 8 +-- .../gnome-3/apps/gnome-clocks/default.nix | 5 +- .../gnome-3/apps/gnome-documents/default.nix | 2 +- .../gnome-3/apps/gnome-logs/default.nix | 2 +- .../gnome-3/apps/gnome-maps/default.nix | 2 +- .../gnome-3/apps/gnome-music/default.nix | 2 +- .../gnome-3/apps/gnome-nettool/default.nix | 2 +- .../gnome-3/apps/gnome-notes/default.nix | 2 +- .../gnome-3/apps/gnome-photos/default.nix | 2 +- .../apps/gnome-power-manager/default.nix | 2 +- .../gnome-3/apps/gnome-todo/default.nix | 10 +-- .../gnome-3/apps/gnome-weather/default.nix | 2 +- .../gnome-3/apps/seahorse/default.nix | 2 +- .../desktops/gnome-3/apps/vinagre/default.nix | 2 +- .../core/adwaita-icon-theme/default.nix | 4 +- pkgs/desktops/gnome-3/core/baobab/default.nix | 2 +- .../desktops/gnome-3/core/caribou/default.nix | 4 +- .../desktops/gnome-3/core/empathy/default.nix | 2 +- .../gnome-3/core/epiphany/default.nix | 6 +- pkgs/desktops/gnome-3/core/evince/default.nix | 11 +-- .../core/evolution-data-server/default.nix | 7 +- pkgs/desktops/gnome-3/core/gdm/default.nix | 4 +- .../gnome-3/core/gnome-bluetooth/default.nix | 2 +- .../gnome-3/core/gnome-calculator/default.nix | 2 +- .../gnome-3/core/gnome-contacts/default.nix | 2 +- .../core/gnome-control-center/default.nix | 11 +-- .../gnome-3/core/gnome-dictionary/default.nix | 4 +- .../core/gnome-disk-utility/default.nix | 18 +++-- .../core/gnome-font-viewer/default.nix | 15 +++-- .../core/gnome-online-accounts/default.nix | 6 +- .../core/gnome-online-miners/default.nix | 26 ++++--- .../gnome-3/core/gnome-screenshot/default.nix | 2 +- .../gnome-3/core/gnome-session/default.nix | 4 +- .../core/gnome-settings-daemon/default.nix | 10 +-- .../gnome-3/core/gnome-shell/default.nix | 19 +++--- .../gnome-3/core/gnome-software/default.nix | 5 +- .../core/gnome-system-monitor/default.nix | 2 +- .../gnome-3/core/gnome-terminal/default.nix | 4 +- .../core/gnome-themes-extra/default.nix | 2 +- .../gnome-3/core/gnome-user-share/default.nix | 22 +++--- .../gnome-3/core/grilo-plugins/default.nix | 10 +-- .../gnome-3/core/gucharmap/default.nix | 4 +- pkgs/desktops/gnome-3/core/mutter/3.28.nix | 11 +-- pkgs/desktops/gnome-3/core/mutter/default.nix | 20 +++--- .../gnome-3/core/nautilus/default.nix | 4 +- .../gnome-3/core/simple-scan/default.nix | 6 +- pkgs/desktops/gnome-3/core/totem/default.nix | 13 ++-- .../gnome-3/core/tracker-miners/default.nix | 6 +- pkgs/desktops/gnome-3/core/vino/default.nix | 2 +- pkgs/desktops/gnome-3/core/yelp/default.nix | 2 +- pkgs/desktops/gnome-3/core/zenity/default.nix | 15 +++-- pkgs/desktops/gnome-3/default.nix | 28 ++++---- .../gnome-3/devtools/devhelp/default.nix | 2 +- .../gnome-3/devtools/nemiver/default.nix | 4 +- .../desktops/gnome-3/games/atomix/default.nix | 2 +- .../gnome-3/games/five-or-more/default.nix | 2 +- .../gnome-3/games/four-in-a-row/default.nix | 2 +- .../gnome-3/games/gnome-chess/default.nix | 2 +- .../gnome-3/games/gnome-klotski/default.nix | 2 +- .../gnome-3/games/gnome-mahjongg/default.nix | 2 +- .../gnome-3/games/gnome-mines/default.nix | 2 +- .../gnome-3/games/gnome-nibbles/default.nix | 2 +- .../gnome-3/games/gnome-robots/default.nix | 2 +- .../gnome-3/games/gnome-sudoku/default.nix | 4 +- .../gnome-3/games/gnome-taquin/default.nix | 2 +- .../gnome-3/games/gnome-tetravex/default.nix | 2 +- .../desktops/gnome-3/games/hitori/default.nix | 2 +- pkgs/desktops/gnome-3/games/iagno/default.nix | 2 +- .../gnome-3/games/lightsoff/default.nix | 2 +- .../gnome-3/games/quadrapassel/default.nix | 2 +- .../gnome-3/games/swell-foop/default.nix | 2 +- pkgs/desktops/gnome-3/games/tali/default.nix | 2 +- pkgs/desktops/gnome-3/misc/geary/default.nix | 9 +-- pkgs/desktops/gnome-3/misc/gitg/default.nix | 7 +- .../gnome-3/misc/gnome-flashback/default.nix | 4 +- .../gnome-3/misc/gnome-packagekit/default.nix | 4 +- .../gnome-3/misc/gnome-panel/default.nix | 4 +- .../misc/gnome-screensaver/default.nix | 4 +- .../gnome-3/misc/gnome-tweaks/default.nix | 2 +- .../gnome-3/misc/metacity/default.nix | 4 +- .../gnome-3/misc/pomodoro/default.nix | 2 +- pkgs/desktops/mate/pluma/default.nix | 2 +- .../elementary-settings-daemon/default.nix | 9 +-- .../haskell-modules/configuration-nix.nix | 2 +- .../haskell-modules/hackage-packages.nix | 45 ++++++------- pkgs/development/libraries/amtk/default.nix | 4 +- pkgs/development/libraries/aravis/default.nix | 2 +- pkgs/development/libraries/gegl/4.0.nix | 4 +- .../libraries/geocode-glib/default.nix | 6 +- pkgs/development/libraries/libgda/default.nix | 4 +- .../libraries/libgdata/default.nix | 3 +- .../libraries/osm-gps-map/default.nix | 7 +- .../development/tools/misc/d-feet/default.nix | 2 +- .../tools/profiling/sysprof/default.nix | 2 +- pkgs/misc/emulators/cdemu/analyzer.nix | 2 +- pkgs/misc/emulators/cdemu/gui.nix | 2 +- pkgs/os-specific/linux/piper/default.nix | 2 +- pkgs/tools/audio/gvolicon/default.nix | 2 +- pkgs/tools/audio/pasystray/default.nix | 2 +- pkgs/tools/graphics/luxcorerender/default.nix | 4 +- .../inputmethods/fcitx/fcitx-configtool.nix | 2 +- pkgs/tools/networking/gupnp-tools/default.nix | 2 +- .../networking/network-manager/applet.nix | 6 +- .../network-manager/fortisslvpn/default.nix | 4 +- .../network-manager/iodine/default.nix | 4 +- .../network-manager/l2tp/default.nix | 4 +- .../network-manager/openconnect/default.nix | 4 +- .../network-manager/openvpn/default.nix | 4 +- .../network-manager/vpnc/default.nix | 4 +- pkgs/tools/security/onioncircuits/default.nix | 4 +- pkgs/top-level/all-packages.nix | 67 ++++++------------- 179 files changed, 464 insertions(+), 447 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index dabf09418da7..6852154378d7 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -53,7 +53,7 @@ in # Supplies some abstract icons such as: # utilities-terminal, accessories-text-editor - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme hicolor-icon-theme tango-icon-theme diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index efec943c0075..76fb0e619d72 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -95,8 +95,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome3.defaultIconTheme; - defaultText = "pkgs.gnome3.defaultIconTheme"; + default = pkgs.gnome3.adwaita-icon-theme; + defaultText = "pkgs.gnome3.adwaita-icon-theme"; description = '' The package path that contains the icon theme given in the name option. ''; @@ -115,8 +115,8 @@ in cursorTheme = { package = mkOption { - default = pkgs.gnome3.defaultIconTheme; - defaultText = "pkgs.gnome3.defaultIconTheme"; + default = pkgs.gnome3.adwaita-icon-theme; + defaultText = "pkgs.gnome3.adwaita-icon-theme"; description = '' The package path that contains the cursor theme given in the name option. ''; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 19cb55d93c98..68660b5d054b 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext glib gtk3 libmowgli dbus-glib libxml2 - xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2 + xorg.libXcomposite gnome3.adwaita-icon-theme alsaLib libjack2 libpulseaudio fluidsynth libmad libogg libvorbis libcdio libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile libmodplug libsamplerate soxr lirc curl wavpack neon faad2 diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index b7b8a4410b7f..53ab4fd6f2fa 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec { gtk3 cairo gettext - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-good diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index e61b9d8b290d..c6fb7c67d584 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac - gsettings-desktop-schemas gnome3.defaultIconTheme + gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; doCheck = false; # fails 1 out of 9 tests diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 2544be383e5d..9a3ad5e0bc3e 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 gobject-introspection - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; checkInputs = with python3Packages; [ diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index c40f84348de1..0727ab56f7de 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl gettext flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf - gdl gnome3.defaultIconTheme gnome3.anjuta + gdl gnome3.adwaita-icon-theme gnome3.anjuta ] ++ (with perlPackages; [ perl XMLParser ]); patchPhase = '' diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 06398324491b..4d9b856499aa 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper - gnome3.defaultIconTheme ]; + gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index a1d85ac91e85..d457f25e3162 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ]; - buildInputs = [ gnome3.defaultIconTheme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] + buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] ++ (if xineBackend then [ xineLib ] else with gst_all_1; [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index e540016ac81c..eab50c904795 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { gtk3 gnome3.libpeas totem-pl-parser - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 012270905cc8..4e24f1edf49a 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -19,7 +19,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool wrapGAppsHook - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 686b27223a6f..303532aca63d 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ - glib gtk3 brasero libcanberra-gtk3 gnome3.defaultIconTheme + glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 1c2e3a425782..f78f7fbf9148 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.defaultIconTheme gtk libxml2 + buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2 enchant gucharmap python ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 71d0f9450f2d..ff6439c8654e 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wrapGAppsHook +{ stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: let version = "3.30.2"; @@ -21,9 +21,9 @@ in stdenv.mkDerivation { intltool ]; - buildInputs = with gnome3; [ + buildInputs = [ amtk - defaultIconTheme + gnome3.adwaita-icon-theme glib gsettings-desktop-schemas gspell diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 7777be918975..962940d076ba 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2"; }; - libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome3; [ + libPath = stdenv.lib.makeLibraryPath (with xorg; [ stdenv.cc.cc.lib gdk_pixbuf glib diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index e8f831a21c20..e88c9222b87c 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool, exiv2, libjpeg, libtiff, gst_all_1, libraw, libsoup, libsecret, + glib, gtk3, gsettings-desktop-schemas, libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison, flex, wrapGAppsHook, shared-mime-info }: @@ -16,10 +17,10 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ]; - buildInputs = with gnome3; [ - glib gtk gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base + buildInputs = [ + glib gtk3 gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base exiv2 libjpeg libtiff libraw libsoup libsecret libchamplain - librsvg libwebp json-glib webkitgtk lcms2 defaultIconTheme + librsvg libwebp json-glib webkitgtk lcms2 gnome3.adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 2f06451438d9..da9fae2441c4 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas libraw json-glib glib gdk_pixbuf librsvg gnome3.rest - gcr gnome3.defaultIconTheme libgdata + gcr gnome3.adwaita-icon-theme libgdata ]; postPatch = '' diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 63d35cc54531..b399dd2d2284 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 , libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig -, imagemagick, intltool, autoreconfHook, which, defaultIconTheme +, imagemagick, intltool, autoreconfHook, which, gnome3 }: let @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { buildInputs = [ ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 - synfig which defaultIconTheme + synfig which gnome3.adwaita-icon-theme ]; postInstall = '' diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index e790ef49acbf..5fc7e309f4df 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead -, hicolor-icon-theme, defaultIconTheme +, hicolor-icon-theme, gnome3 # Test requirements , dbus, xvfb_run, xdotool @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { ''; checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; - buildInputs = [ hicolor-icon-theme defaultIconTheme librsvg ]; + buildInputs = [ hicolor-icon-theme gnome3.adwaita-icon-theme librsvg ]; propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; makeWrapperArgs = [ diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index bf97cff5030d..da5cf83c02c1 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { sqlite librsvg gnome3.gtk - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; patches = [ ./correct-post-install.patch ]; diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index 154af4efc9b7..1cf6f547c30b 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -13,7 +13,7 @@ , glib , libsoup , gnome-online-accounts -, rest +, librest , json-glib , gnome-autoar , gspell @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { glib libsoup gnome-online-accounts - rest + librest json-glib gnome-autoar gspell diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index f5420a0c9449..724707d0be5f 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ glib gtk3 libgtop gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 libgtop gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x build-aux/meson/postinstall.sh diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index 6c84f3cbd326..1e237923d054 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib gnome2.gtksourceview gnome2.pango gtk2-x11 gtkspell2 poppler - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; preConfigure = '' diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 2649c7cbd6a9..633c1d82159a 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138"; }; - buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index deb456e53ed9..dfacdc75f1c5 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -17,7 +17,7 @@ in buildPythonApplication rec { buildInputs = [ gtk3 gobject-introspection - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 5a856a5f2b28..413f082fb22a 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, python3 +, meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas , gnome3, pantheon, gobject-introspection, wrapGAppsHook , gtk3, json-glib, glib, glib-networking, hicolor-icon-theme }: @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 pantheon.granite json-glib glib glib-networking hicolor-icon-theme - gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas + libgee gnome3.libsoup gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index f74e64d3798d..b1ed151f4ddf 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -89,7 +89,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg wrapGAppsHook ]; - buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ]; + buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.adwaita-icon-theme ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 88b0a89db4b1..a909759bedf8 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -78,7 +78,7 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; outputs = ["out" "sandbox"]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 2d9692c0528e..bcebb321a2cc 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -31,7 +31,7 @@ , libgnome , libgnomeui , libnotify -, defaultIconTheme +, gnome3 , libGLU_combined , nspr , nss @@ -141,7 +141,7 @@ stdenv.mkDerivation { inherit gtk3; - buildInputs = [ wrapGAppsHook gtk3 defaultIconTheme ]; + buildInputs = [ wrapGAppsHook gtk3 gnome3.adwaita-icon-theme ]; # "strip" after "patchelf" may break binaries. # See: https://github.com/NixOS/patchelf/issues/10 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index bc3a1ed844a4..90df5c40395a 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -131,7 +131,7 @@ let --set GDK_BACKEND "wayland" \ ''}${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' + --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' '' } diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 6043744f296c..b0ae61c761df 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation rec { gsettings-desktop-schemas glib gtk # needed for XDG_ICON_DIRS - gnome.defaultIconTheme + gnome.adwaita-icon-theme ]; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 290810198ade..131209033836 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr +{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas , gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking, gnome3 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr - (libsoup.override { gnomeSupport = true; }) gnome3.libpeas + (libsoup.override { gnomeSupport = true; }) libpeas glib-networking ]; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 74ee7c302e62..99c70f012414 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -39,7 +39,7 @@ # Wrapper runtime , coreutils , glibcLocales -, defaultIconTheme +, gnome3 , runtimeShell , shared-mime-info , gsettings-desktop-schemas @@ -252,7 +252,7 @@ stdenv.mkDerivation rec { EOF WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - defaultIconTheme + gnome3.adwaita-icon-theme shared-mime-info ]} WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index a7cfc6058244..f93b34b52f56 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala_0_40, gettext, python3 , appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook +, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo }: @@ -29,10 +30,9 @@ stdenv.mkDerivation rec { buildInputs = [ curl glib json-glib libnotify libsecret sqlite gumbo - ] ++ (with gnome3; [ - gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts + gtk3 libgee libpeas gnome3.libsoup librest webkitgtk gnome3.gnome-online-accounts gsettings-desktop-schemas - ]) ++ (with gst_all_1; [ + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]); diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index 9252b95a00c7..25ec5d29613a 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3 -, gtk3, gnome3, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: +, gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "taxi"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ pantheon.granite - gnome3.libgee + libgee gtk3 libsecret libsoup diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index 1e88456e6b24..86fb3d7de2c1 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -1,5 +1,5 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, - cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook }: + cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }: buildGoPackage rec { name = "coyim-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1sna1n9dz1crws6cb1yjhy2kznbngjlbiw2diycshvbfigf7y7xl"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gnome3.gtk gnome3.defaultIconTheme ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gtk3 gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { description = "a safe and secure chat client"; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 0ee051a87fbd..6e57ae85ef57 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -2,7 +2,7 @@ , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext , gobject-introspection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon -, libnotify, libsoup +, libnotify, libsoup, libgee , libgcrypt , epoxy , at-spi2-core @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { gobject-introspection glib-networking glib - gnome3.libgee - gnome3.defaultIconTheme + libgee + gnome3.adwaita-icon-theme sqlite gdk_pixbuf gtk3 diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 18d593bbdecb..0fea8f0574b2 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool evolution-data-server gnome-doc-utils avahi libsigcxx gtk dbus-glib libnotify libXext xorgproto sqlite - gnome3.libsoup glib gnome3.defaultIconTheme boost + gnome3.libsoup glib gnome3.adwaita-icon-theme boost autoreconfHook pkgconfig libxml2 unixODBC db nspr nss zlib libsecret libXrandr which libxslt libtasn1 gmp nettle makeWrapper ] diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index cf4e6358dff3..8c1af783602a 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, gettext, wrapGAppsHook # Native dependencies -, python3, gtk3, gobject-introspection, defaultIconTheme +, python3, gtk3, gobject-introspection, gnome3 # Test dependencies , xvfb_run, dbus @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { ''; buildInputs = [ - gobject-introspection gtk3 defaultIconTheme + gobject-introspection gtk3 gnome3.adwaita-icon-theme ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ] ++ lib.optional enableSecrets libsecret ++ lib.optional enableSpelling gspell diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 006684ecc102..41f3a271a699 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable +, gtkmm3, libpeas, gsettings-desktop-schemas , makeWrapper, python3, python3Packages , vim ? vim_configurable.override { features = "normal"; @@ -21,10 +22,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas - python3 python3Packages.pygobject3 - notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme - glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]); + buildInputs = [ + gtkmm3 gmime3 webkitgtk libsass libpeas + python3 python3Packages.pygobject3 + notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme + glib-networking protobuf + ] ++ (if vim == null then [] else [ vim ]); postPatch = '' sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 2b62db069bc9..56a676178cca 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -21,7 +21,7 @@ in pythonPackages.buildPythonApplication rec { gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index ed798ee92331..5ca6b52d8c4b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -30,7 +30,7 @@ , libcanberra-gtk2 , libgnome , libgnomeui -, defaultIconTheme +, gnome3 , libGLU_combined , nspr , nss @@ -117,7 +117,7 @@ stdenv.mkDerivation { stdenv.cc.cc ]; - buildInputs = [ gtk3 defaultIconTheme ]; + buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index c8132585fb04..ff090aac7690 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { hunspell libevent libstartup_notification /* cairo */ icu libpng jemalloc ] - ++ lib.optionals enableGTK3 [ gtk3 gnome3.defaultIconTheme ]; + ++ lib.optionals enableGTK3 [ gtk3 gnome3.adwaita-icon-theme ]; # from firefox + m4 + wrapperTool nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ]; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index a53bea23e199..a4324f3c4a2a 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -6,7 +6,7 @@ , libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib # The themes here are soft dependencies; only icons are missing without them. -, hicolor-icon-theme, adwaita-icon-theme +, hicolor-icon-theme, gnome3 }: with stdenv.lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pcre libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core - openssl hicolor-icon-theme adwaita-icon-theme json-glib + openssl hicolor-icon-theme gnome3.adwaita-icon-theme json-glib ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 149e126d6e87..67418838d74f 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3 -, gnome3, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk +, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk, geocode-glib , libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ clutter clutter-gtk - gnome3.geocode-glib + geocode-glib gtk3 json-glib libappindicator diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 8dd127715aeb..6808a81bec1d 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gtk3, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl -, boost, libxslt, goffice, wrapGAppsHook, iconTheme +, boost, libxslt, goffice, wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 librsvg bzip2 fribidi libpng popt - libgsf enchant wv libjpeg perl boost libxslt goffice iconTheme + libgsf enchant wv libjpeg perl boost libxslt goffice gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index e42777bdd006..87aaf85d950c 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { # ToDo: optional libgda, introspection? buildInputs = [ - goffice gtk3 gnome3.defaultIconTheme + goffice gtk3 gnome3.adwaita-icon-theme python pygobject3 ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 7c07082b3041..f901123065fa 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup - gnome3.defaultIconTheme ]; + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { description = "A personnal accounting application."; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 12b5aef898d1..f93b7f42c68a 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup - gnome3.defaultIconTheme ]; + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index b60874e7c3ca..5853face10c7 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, defaultIconTheme, glib, ncurses, epoxy, gpgme +, gnome3, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false @@ -277,7 +277,7 @@ in stdenv.mkDerivation rec { mdds bluez5 libcmis libwps libabw libzmf libtool libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy - libodfgen CoinMP librdf_rasqal defaultIconTheme gettext + libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] ++ lib.optional kdeIntegration kdelibs4; nativeBuildInputs = [ wrapGAppsHook gdb ]; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index ff8823e3d9cf..64b12263e9a5 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, defaultIconTheme, glib, ncurses, epoxy, gpgme +, gnome3, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false @@ -272,7 +272,7 @@ in stdenv.mkDerivation rec { mdds bluez5 libcmis libwps libabw libzmf libtool libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy - libodfgen CoinMP librdf_rasqal defaultIconTheme gettext + libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] ++ lib.optional kdeIntegration kdelibs4; nativeBuildInputs = [ wrapGAppsHook gdb ]; diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index a48b6e1e1168..8d76f160d7b2 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { # Patch out a few paths that assume that we're using the FHS: postPatch = '' - themeDir="$(echo "${gnome3.defaultIconTheme}/share/icons/"*)" + themeDir="$(echo "${gnome3.adwaita-icon-theme}/share/icons/"*)" sed -i -e "s,/usr/share/icons/gnome,$themeDir," src/paperwork/deps.py sed -i -e 's,sys\.prefix,"",g' \ @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { checkInputs = [ xvfb_run dbus.daemon ]; buildInputs = [ - gnome3.defaultIconTheme hicolor-icon-theme libnotify librsvg + gnome3.adwaita-icon-theme hicolor-icon-theme libnotify librsvg ]; # A few parts of chkdeps need to have a display and a dbus session, so we not diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 833cb7fc56a0..4422aaa2b448 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -32,7 +32,7 @@ python2Packages.buildPythonApplication rec { buildInputs = [ atk gtk3 - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gtkspell3 goocanvas2 ]; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index fb0ea2067355..aef18abaedfb 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -4,6 +4,8 @@ , gtk3 , pantheon , gnome3 +, gtksourceview +, libgee , cmake , libqalculate , gobject-introspection @@ -35,8 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [ pantheon.elementary-icon-theme - gnome3.gtksourceview - gnome3.libgee + gtksourceview + libgee gnome3.libsoup pantheon.granite gtk3 diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 67cdaa4055ac..d9de12d45763 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa"; }; - buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ]; + buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ wrapGAppsHook cmake gettext ]; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 6456dd75b522..83f26fa08fc3 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { intltool itstool libxml2 gobject-introspection wrapGAppsHook ]; buildInputs = [ - gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme + gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ]; checkInputs = [ xvfb_run python3.pkgs.pytest dbus ]; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 2cd4f19ca939..6e0b7412558e 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -48,7 +48,7 @@ in python3Packages.buildPythonApplication rec { buildInputs = [ gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas libnotify gst-transcoder ] ++ (with gst_all_1; [ diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index 6042f490dfa0..1671c3f14d00 100644 --- a/pkgs/applications/video/screenkey/default.nix +++ b/pkgs/applications/video/screenkey/default.nix @@ -9,7 +9,7 @@ , libX11 , libXtst , wrapGAppsHook -, defaultIconTheme +, gnome3 , hicolor-icon-theme }: buildPythonApplication rec { @@ -39,7 +39,7 @@ buildPythonApplication rec { ]; buildInputs = [ - defaultIconTheme + gnome3.adwaita-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index a43e1733f063..0668400d28ca 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, - pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd, which, + pkgconfig, glib, gtk3, gtkmm3, iproute, dbus, systemd, which, withX ? true }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ] - ++ lib.optionals withX [ gtk gtkmm libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; + ++ lib.optionals withX [ gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; patches = [ ./recognize_nixos.patch ]; postPatch = '' diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 52732f0c5f10..3163ab501502 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = - [ libvirt-glib vte dconf gtk-vnc gnome3.defaultIconTheme avahi + [ libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtk3 ] ++ optional spiceSupport spice-gtk; diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 5de7d93f49c6..4815103893f0 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libxml2 python3Packages.python python3Packages.pyatspi python3Packages.pygobject3 python3Packages.ipython - at-spi2-core dbus libwnck3 gnome3.defaultIconTheme + at-spi2-core dbus libwnck3 gnome3.adwaita-icon-theme ]; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index dc598267c4b4..0b86cfbf86ad 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -1,5 +1,7 @@ { stdenv, cmake, ninja, intltool, fetchurl, libxml2, webkitgtk, highlight -, pkgconfig, gtk3, glib, libnotify, gtkspell3 +, pkgconfig, gtk3, glib, libnotify, gtkspell3, evolution-data-server +, adwaita-icon-theme, gnome-desktop, libgdata +, libgweather, glib-networking, gsettings-desktop-schemas , wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: @@ -14,17 +16,17 @@ in stdenv.mkDerivation rec { sha256 = "10dy08xpizvvj7r8xgs3lr6migm3ipr199yryqz7wgkycq6nf53b"; }; - propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; + propagatedUserEnvPkgs = [ evolution-data-server ]; buildInputs = [ - gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu - gnome3.evolution-data-server libsecret libical gcr - webkitgtk shared-mime-info gnome3.gnome-desktop gtkspell3 - libcanberra-gtk3 bogofilter gnome3.libgdata sqlite + gtk3 glib gdk_pixbuf adwaita-icon-theme librsvg db icu + evolution-data-server libsecret libical gcr + webkitgtk shared-mime-info gnome-desktop gtkspell3 + libcanberra-gtk3 bogofilter libgdata sqlite gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit - nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings-desktop-schemas - gnome3.glib-networking openldap + nss nspr libnotify procps highlight libgweather + gsettings-desktop-schemas + glib-networking openldap ]; nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index fe307bca797b..5ee26eba6b7d 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive +{ stdenv, fetchurl, glib, gtk3, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive , file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ]; - buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ]; + buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus ]; PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 61eda9421945..8310f426be6c 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -1,5 +1,6 @@ { stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib +, pkgconfig, gtk3, glib, adwaita-icon-theme +, libpeas, gtksourceview, gsettings-desktop-schemas , wrapGAppsHook, itstool, libsoup, libxml2 , gnome3, gspell }: @@ -16,9 +17,9 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib - gnome3.defaultIconTheme libsoup - gnome3.libpeas gnome3.gtksourceview - gnome3.gsettings-desktop-schemas gspell + adwaita-icon-theme libsoup + libpeas gtksourceview + gsettings-desktop-schemas gspell ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index d9f1e7850afd..388808b7d646 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, +{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -10,13 +10,16 @@ stdenv.mkDerivation rec { sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "ghex"; attrPath = "gnome3.ghex"; }; - }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtk intltool itstool libxml2 ]; + buildInputs = [ gtk3 intltool itstool libxml2 ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "ghex"; + attrPath = "gnome3.ghex"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Ghex; diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 39e0f2ba23e1..9adffc7922c2 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib libxml2 python3 python3.pkgs.pygobject3 gnome3.gsettings-desktop-schemas - gdk_pixbuf gnome3.defaultIconTheme + gdk_pixbuf gnome3.adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 357cd42d66bd..216902872457 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { libvirt-glib glib gtk3 gtk-vnc freerdp libxml2 libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive - gnome3.defaultIconTheme librsvg acl libgudev libsecret + gnome3.adwaita-icon-theme librsvg acl libgudev libsecret libcap_ng numactl xen libapparmor ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 8cc8712a15de..9b48e3231911 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3 -, gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup +, gettext, libxml2, gnome3, gtk3, evolution-data-server, libsoup , glib, gnome-online-accounts, gsettings-desktop-schemas }: let @@ -22,8 +22,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ]; buildInputs = [ - gtk evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib - gsettings-desktop-schemas gnome3.defaultIconTheme + gtk3 evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib + gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 047f9bc22102..101b9f4a62ec 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3 -, gobject-introspection, gjs, libunistring }: +, gobject-introspection, gjs, libunistring, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop }: stdenv.mkDerivation rec { name = "gnome-characters-${version}"; @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobject-introspection ]; buildInputs = [ - glib gtk3 gjs pango gnome3.gsettings-desktop-schemas - gnome3.defaultIconTheme libunistring + glib gtk3 gjs pango gsettings-desktop-schemas + adwaita-icon-theme libunistring # typelib - gnome3.gnome-desktop + gnome-desktop ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 30323cf62f53..c614dc6486c8 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl , meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils , vala, gobject-introspection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop +, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, geocode-glib , gnome3, gdk_pixbuf, geoclue2, libgweather }: stdenv.mkDerivation rec { @@ -26,8 +27,8 @@ stdenv.mkDerivation rec { gobject-introspection # for finding vapi files ]; buildInputs = [ - gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme - gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound + gtk3 glib gsettings-desktop-schemas gdk_pixbuf adwaita-icon-theme + gnome-desktop geocode-glib geoclue2 libgweather gsound ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index d2792304016f..186f3a14d271 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas - gdk_pixbuf gnome3.defaultIconTheme evince + gdk_pixbuf gnome3.adwaita-icon-theme evince libsoup webkitgtk gjs gobject-introspection tracker tracker-miners libgdata gnome-desktop libzapojit libgepub diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index c6140a53fd9b..89f4cc01e50c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils libxml2 libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 2f7e5bbe8071..d7df923339a9 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { geocode-glib libchamplain libsoup gdk_pixbuf librsvg libgweather gnome3.gsettings-desktop-schemas evolution-data-server - gnome-online-accounts gnome3.defaultIconTheme + gnome-online-accounts gnome3.adwaita-icon-theme webkitgtk ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 3edf1f5dd402..ea12dff14fc2 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = with gst_all_1; [ gtk3 glib libmediaart gnome-online-accounts - gdk_pixbuf gnome3.defaultIconTheme python3 + gdk_pixbuf gnome3.adwaita-icon-theme python3 grilo grilo-plugins libnotify libdazzle libsoup gnome3.gsettings-desktop-schemas tracker gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix index dcee87dc799c..9bc71bb43389 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook libgtop intltool itstool libxml2 - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; propagatedUserEnvPkgs = [ nmap inetutils ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index e39ce00fd658..78c39651ad6b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { gnome3.gnome-online-accounts zeitgeist gnome3.gsettings-desktop-schemas evolution-data-server - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 508b8af3f4f7..8c0c216965d1 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { buildInputs = [ gtk3 glib gegl babl libgdata libdazzle gnome3.gsettings-desktop-schemas - gdk_pixbuf gnome3.defaultIconTheme + gdk_pixbuf gnome3.adwaita-icon-theme gfbgraph grilo-plugins grilo gnome-online-accounts tracker gexiv2 geocode-glib dleyna-renderer diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index 3f8ce7f4a51a..2d9c313e641d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { gtk3 glib upower - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index 37b48a744822..23b671ebfc09 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, python3, wrapGAppsHook -, gettext, gnome3, glib, gtk, libpeas +, gettext, gnome3, glib, gtk3, libpeas , gnome-online-accounts, gsettings-desktop-schemas -, evolution-data-server, libxml2, libsoup, libical, rest, json-glib }: +, evolution-data-server, libxml2, libsoup, libical, librest, json-glib }: let pname = "gnome-todo"; @@ -18,11 +18,11 @@ in stdenv.mkDerivation rec { meson ninja pkgconfig gettext python3 wrapGAppsHook ]; buildInputs = [ - glib gtk libpeas gnome-online-accounts - gsettings-desktop-schemas gnome3.defaultIconTheme + glib gtk3 libpeas gnome-online-accounts + gsettings-desktop-schemas gnome3.adwaita-icon-theme # Plug-ins evolution-data-server libxml2 libsoup libical - rest json-glib + librest json-glib ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 6a827b7f0e3c..5ae279f57f04 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ gtk3 gjs gobject-introspection gnome-desktop - libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas + libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas ]; # The .service file isn't wrapped with the correct environment diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 9ef2b57e6d14..84f7b519d1e2 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib gcr gnome3.gsettings-desktop-schemas gnupg - gnome3.defaultIconTheme gpgme + gnome3.adwaita-icon-theme gpgme libsecret avahi libsoup p11-kit openssh openldap ]; diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index 00037f526b64..ae360d73b879 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ - gtk3 vte libxml2 gtk-vnc libsecret gnome3.defaultIconTheme librsvg + gtk3 vte libxml2 gtk-vnc libsecret gnome3.adwaita-icon-theme librsvg ]; NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 4fa40a6c1b08..b091395ab37b 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome3 -, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor-icon-theme }: +, iconnamingutils, gtk3, gdk_pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "adwaita-icon-theme-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdk_pixbuf librsvg ]; - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; + nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk3 ]; # remove a tree of dirs with no files within postInstall = '' rm -rf "$out/locale" ''; diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index c29e3ff5200d..cf73524a0ca2 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ gtk3 glib gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index fe2b50f296a4..bad06bae4054 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook -, wrapGAppsHook }: +, wrapGAppsHook, libgee }: let pname = "caribou"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { libXtst gtk2 ]; - propagatedBuildInputs = [ gnome3.libgee libxklavier ]; + propagatedBuildInputs = [ libgee libxklavier ]; postPatch = '' patchShebangs . diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 1a4ef2a1cf41..19f2783be3d3 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gcr libsecret libpulseaudio gdk_pixbuf libnotify clutter libsoup gnutls libgee p11-kit libcanberra-gtk3 telepathy-farstream farstream - gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas librsvg # Spell-checking enchant isocodes diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index c8ca0016d57d..37cdce40f340 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu +{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk3, glib, icu , wrapGAppsHook, gnome3, libxml2, libxslt, itstool , webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit , sqlite, gcr, isocodes, desktop-file-utils, python3 @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify + gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify sqlite isocodes p11-kit icu - gdk_pixbuf gnome3.defaultIconTheme gcr + gdk_pixbuf gnome3.adwaita-icon-theme gcr glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav json-glib libdazzle diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 94d39964bc48..1a01bd307eaa 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,7 +1,8 @@ { fetchurl, stdenv, pkgconfig, intltool, libxml2 , glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3 , poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook -, librsvg, gobject-introspection, yelp-tools, gspell +, librsvg, gobject-introspection, yelp-tools, gspell, adwaita-icon-theme, gsettings-desktop-schemas +, libgxps , recentListSize ? null # 5 is not enough, allow passing a different number , supportXPS ? false # Open XML Paper Specification via libgxps , autoreconfHook, pruneLibtoolFiles @@ -26,10 +27,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 pango atk gdk_pixbuf libxml2 - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas poppler ghostscriptX djvulibre libspectre libarchive - libsecret librsvg gnome3.adwaita-icon-theme gspell - ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; + libsecret librsvg adwaita-icon-theme gspell + ] ++ stdenv.lib.optional supportXPS libgxps; configureFlags = [ "--disable-nautilus" # Do not build nautilus plugin @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { (if supportXPS then "--enable-xps" else "--disable-xps") ]; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; preConfigure = stdenv.lib.optionalString (recentListSize != null) '' sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 89f6ccc17102..3daeb8d61554 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,7 +1,8 @@ { fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobject-introspection , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre -, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: +, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib +, glib, gtk3, gnome-online-accounts, libgweather, libgdata }: stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; @@ -25,8 +26,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobject-introspection vala ]; - buildInputs = with gnome3; [ - glib libsoup libxml2 gtk gnome-online-accounts + buildInputs = [ + glib libsoup libxml2 gtk3 gnome-online-accounts gcr p11-kit libgweather libgdata libaccounts-glib json-glib icu sqlite kerberos openldap webkitgtk glib-networking libcanberra-gtk3 pcre diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 135200ee3c4f..aa6374d00ece 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg , accountsservice, libX11, gnome3, systemd, autoreconfHook -, gtk, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth +, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth , librsvg, coreutils, xwayland, fetchpatch }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool gnome3.dconf ]; buildInputs = [ glib accountsservice systemd - gobject-introspection libX11 gtk + gobject-introspection libX11 gtk3 libcanberra-gtk3 pam plymouth librsvg ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index b065025327ff..e09d0b4e6f93 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3 - gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 4a37599b136d..037509b9c548 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib libxml2 gtksourceview3 mpfr gmp - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas libsoup libmpc ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index a7347f74ca4b..253bbc4e1967 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas folks gnome-desktop telepathy-glib libxml2 gnome-online-accounts cheese - gnome3.defaultIconTheme libchamplain clutter-gtk geocode-glib + gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index f1423f883d4e..0862cda759ad 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -5,7 +5,10 @@ , cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc , libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd , docbook_xsl, modemmanager, clutter, clutter-gtk, cheese -, fontconfig, sound-theme-freedesktop, grilo, python3 }: +, fontconfig, sound-theme-freedesktop, grilo, python3 +, gtk3, glib, glib-networking, gsettings-desktop-schemas +, gnome-desktop, gnome-settings-daemon, gnome-online-accounts +, vino, gnome-bluetooth, tracker, adwaita-icon-theme }: let pname = "gnome-control-center"; @@ -23,13 +26,13 @@ in stdenv.mkDerivation rec { shared-mime-info python3 ]; - buildInputs = with gnome3; [ - ibus gtk glib glib-networking upower gsettings-desktop-schemas + buildInputs = [ + ibus gtk3 glib glib-networking upower gsettings-desktop-schemas libxml2 gnome-desktop gnome-settings-daemon polkit libgtop gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify grilo libpwquality cracklib vino libcanberra-gtk3 libgudev libsecret - gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk cheese + gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese networkmanager modemmanager gnome-bluetooth tracker ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 1019a809d7f8..a15d2d7f6e62 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 -, gnome3, gtk, glib }: +, gnome3, gtk3, glib }: stdenv.mkDerivation rec { name = "gnome-dictionary-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 5d224623c3ca..629dfe0421be 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,5 +1,5 @@ { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread -, meson, ninja, gtk, glib, wrapGAppsHook, python3, libnotify +, meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify , itstool, gnome3, libxml2 , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: @@ -12,17 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-disk-utility"; attrPath = "gnome3.gnome-disk-utility"; }; - }; - nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt docbook_xsl wrapGAppsHook python3 libxml2 ]; + buildInputs = [ - gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 - udisks2 gnome3.defaultIconTheme + gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 + udisks2 gnome3.adwaita-icon-theme gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas ]; @@ -31,6 +28,13 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-disk-utility"; + attrPath = "gnome3.gnome-disk-utility"; + }; + }; + meta = with stdenv.lib; { homepage = https://en.wikipedia.org/wiki/GNOME_Disks; description = "A udisks graphical front-end"; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 06a5b258c80f..3e8f7d3617fb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -1,5 +1,5 @@ { stdenv, meson, ninja, gettext, fetchurl -, pkgconfig, gtk3, glib, libxml2 +, pkgconfig, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme , wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { @@ -11,18 +11,21 @@ stdenv.mkDerivation rec { sha256 = "1wwnx2zrlbd2d6np7m9s78alx6j6ranrnh1g2z6zrv9qcj8rpzz5"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-font-viewer"; attrPath = "gnome3.gnome-font-viewer"; }; - }; - doCheck = true; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ]; - buildInputs = [ gtk3 glib gnome3.gnome-desktop gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme ]; # Do not run meson-postinstall.sh preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-font-viewer"; + attrPath = "gnome3.gnome-font-viewer"; + }; + }; + meta = with stdenv.lib; { description = "Program that can preview fonts and create thumbnails for fonts"; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index 4ceb0335c183..f797c6b89148 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook -, webkitgtk, json-glib, rest, libsecret, gtk-doc, gobject-introspection +{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook +, webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection , gettext, icu, glib-networking , libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc ]; buildInputs = [ - glib gtk webkitgtk json-glib rest libsecret glib-networking icu libsoup + glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup gcr kerberos ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index 6deefaa36732..ed4c1a3da13a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }: +, libgdata, grilo, libzapojit, grilo-plugins, gnome-online-accounts, libmediaart +, tracker, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gnome-online-miners-${version}"; @@ -10,19 +11,24 @@ stdenv.mkDerivation rec { sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-online-miners"; attrPath = "gnome3.gnome-online-miners"; }; - }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl - gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins - gnome3.gnome-online-accounts gnome3.libmediaart - gnome3.tracker gnome3.gfbgraph json-glib gnome3.rest - dleyna-server ]; + buildInputs = [ + glib libgdata libxml2 libsoup gmp openssl + grilo libzapojit grilo-plugins + gnome-online-accounts libmediaart + tracker gfbgraph json-glib librest + dleyna-server + ]; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-online-miners"; + attrPath = "gnome3.gnome-online-miners"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; description = "A set of crawlers that go through your online content and index them locally in Tracker"; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index fc39ea812237..3ce2a4433acd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; buildInputs = [ - gtk3 glib libcanberra-gtk3 gnome3.defaultIconTheme + gtk3 glib libcanberra-gtk3 gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 2f44a4e168df..34921d46b4cd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas +{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 , libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib gtk libICE gnome-desktop json-glib xorg.xtrans gnome3.defaultIconTheme + glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome3.adwaita-icon-theme gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index c76ba218c9ac..7a2271e128de 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,7 +1,7 @@ -{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst -, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit +{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, gtk3, glib, libnotify, lcms2, libXtst +, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit, gsettings-desktop-schemas , geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager -, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }: +, gnome-desktop, geocode-glib, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }: stdenv.mkDerivation rec { name = "gnome-settings-daemon-${version}"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook python3 ]; - buildInputs = with gnome3; [ - ibus gtk glib gsettings-desktop-schemas networkmanager + buildInputs = [ + ibus gtk3 glib gsettings-desktop-schemas networkmanager libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio alsaLib libcanberra-gtk3 upower colord libgweather xkeyboard_config nss polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 76e5bd13522e..693a3bec4868 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -2,9 +2,10 @@ , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils -, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr -, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd -, sassc, systemd, gst_all_1 }: +, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou +, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop +, gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3 +, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -26,16 +27,16 @@ in stdenv.mkDerivation rec { meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales sassc desktop-file-utils libxslt.bin ]; - buildInputs = with gnome3; [ + buildInputs = [ systemd caribou gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice libcroco libsecret libsoup polkit gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy-glib libXtst gjs mutter libpulseaudio evolution-data-server - libical gtk gstreamer gdm libcanberra-gtk3 geoclue2 - defaultIconTheme gnome3.gnome-bluetooth - gnome3.gnome-clocks # schemas needed - at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon + libical gtk3 gstreamer gdm libcanberra-gtk3 geoclue2 + adwaita-icon-theme gnome-bluetooth + gnome-clocks # schemas needed + at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon gst_all_1.gst-plugins-good # recording gobject-introspection @@ -45,7 +46,7 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ # Needed to support on-screen keyboard used with touch screen devices # see https://github.com/NixOS/nixpkgs/issues/25968 - gnome3.caribou + caribou ]; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 3c45842fdd40..cab777f4febe 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree , glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd +, gtk3, gsettings-desktop-schemas, gnome-desktop , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }: stdenv.mkDerivation rec { @@ -24,8 +25,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gtk glib packagekit appstream-glib libsoup - gnome3.gsettings-desktop-schemas gnome3.gnome-desktop + gtk3 glib packagekit appstream-glib libsoup + gsettings-desktop-schemas gnome-desktop gspell json-glib libsecret ostree polkit flatpak fwupd ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index a1e3ece3db40..4b02411b4863 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { polkit # for ITS file ]; buildInputs = [ - bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.defaultIconTheme librsvg + bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.adwaita-icon-theme librsvg gnome3.gsettings-desktop-schemas systemd ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 4765edbcf7e5..6bde15ba762e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus -, gtk, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala +, gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala , desktop-file-utils, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk gsettings-desktop-schemas vte libuuid dconf + gtk3 gsettings-desktop-schemas vte libuuid dconf # For extension nautilus ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix index b6c40b28ab1a..3d5cfb85d671 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.adwaita-icon-theme ]; postFixup = '' gtk-update-icon-cache "$out"/share/icons/HighContrast diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 6a5d2fde5018..134ba41d6534 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, apacheHttpd, nautilus -, pkgconfig, gtk3, glib, libxml2, systemd +, pkgconfig, gtk3, glib, libxml2, systemd, adwaita-icon-theme , wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd , gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; preConfigure = '' sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ @@ -26,15 +26,19 @@ stdenv.mkDerivation rec { -i data/dav_user_2.4.conf ''; - configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd" - "--with-modules-path=${apacheHttpd.dev}/modules" - "--with-systemduserunitdir=$(out)/etc/systemd/user" - "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; + configureFlags = [ + "--with-httpd=${apacheHttpd.out}/bin/httpd" + "--with-modules-path=${apacheHttpd.dev}/modules" + "--with-systemduserunitdir=$(out)/etc/systemd/user" + "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" + ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool libxml2 libtool - wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg - nautilus libnotify libcanberra-gtk3 systemd ]; + buildInputs = [ + gtk3 glib intltool itstool libxml2 libtool + wrapGAppsHook file gdk_pixbuf adwaita-icon-theme librsvg + nautilus libnotify libcanberra-gtk3 systemd + ]; postInstall = '' mkdir -p $out/share/gsettings-schemas/$name diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index ab2ead7d3449..02e0c29fdaa7 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite -, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite, librest +, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av, libgdata, libmediaart , gmime, json-glib, avahi, tracker, dleyna-server, itstool, totem-pl-parser }: let @@ -15,10 +15,10 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext itstool ]; buildInputs = [ - gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata + gnome3.grilo libxml2 gupnp gssdp libgdata lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts - totem-pl-parser gnome3.rest gmime json-glib - avahi gnome3.libmediaart tracker dleyna-server + totem-pl-parser librest gmime json-glib + avahi libmediaart tracker dleyna-server ]; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index a968bfd2b569..2b7794a9a8ef 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, defaultIconTheme +{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, adwaita-icon-theme , glib, desktop-file-utils, gtk-doc, autoconf, automake, libtool , wrapGAppsHook, gnome3, itstool, libxml2, yelp-tools , docbook_xsl, docbook_xml_dtd_412, gsettings-desktop-schemas @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { yelp-tools libxml2 desktop-file-utils gobject-introspection ]; - buildInputs = [ gtk3 glib gsettings-desktop-schemas defaultIconTheme ]; + buildInputs = [ gtk3 glib gsettings-desktop-schemas adwaita-icon-theme ]; configureFlags = [ "--with-unicode-data=${unicode-data}" diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix index e80212713aae..2988dd1b47e2 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -1,7 +1,8 @@ { fetchurl, stdenv, fetchpatch, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo -, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 +, glib, gtk3, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 +, gsettings-desktop-schemas, gnome-desktop , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput -, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: +, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { name = "mutter-${version}"; @@ -32,10 +33,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; - buildInputs = with gnome3; [ - glib gobject-introspection gtk gsettings-desktop-schemas upower + buildInputs = [ + glib gobject-introspection gtk3 gsettings-desktop-schemas upower gnome-desktop cairo pango cogl clutter zenity libstartup_notification - gnome3.geocode-glib libinput libgudev libwacom + geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile libxkbcommon pipewire ]; diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 9a1418cbe0a9..85b4990c471a 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,7 +1,8 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput -, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: +, gsettings-desktop-schemas, glib, gtk3, gnome-desktop +, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { name = "mutter-${version}"; @@ -12,10 +13,6 @@ stdenv.mkDerivation rec { sha256 = "0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "mutter"; attrPath = "gnome3.mutter"; }; - }; - configureFlags = [ "--with-x" "--disable-static" @@ -36,10 +33,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; - buildInputs = with gnome3; [ - glib gobject-introspection gtk gsettings-desktop-schemas upower + buildInputs = [ + glib gobject-introspection gtk3 gsettings-desktop-schemas upower gnome-desktop cairo pango cogl clutter zenity libstartup_notification - gnome3.geocode-glib libinput libgudev libwacom + geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile libxkbcommon pipewire ]; @@ -51,6 +48,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = "mutter"; + attrPath = "gnome3.mutter"; + }; + }; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index b581d8f09837..715686460a38 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2 -, desktop-file-utils, python3, wrapGAppsHook , gtk, gnome3, gnome-autoar +, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar , glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi , librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf , substituteAll, bubblewrap @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib-networking shared-mime-info libexif gtk exempi libnotify libselinux + glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux tracker tracker-miners gexiv2 libseccomp bubblewrap gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index ef79f972ff0f..742819e0ba17 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook -, cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp +, cairo, gdk_pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp , libxml2, sane-backends, vala, gnome3, gobject-introspection }: stdenv.mkDerivation rec { @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb - gtk libwebp packagekit sane-backends vala + cairo gdk_pixbuf colord glib gnome3.adwaita-icon-theme gusb + gtk3 libwebp packagekit sane-backends vala ]; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2 diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 3565931e4df1..d4a66b6c4936 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, meson, ninja, intltool, gst_all_1 , clutter-gtk, clutter-gst, python3Packages, shared-mime-info , pkgconfig, gtk3, glib, gobject-introspection, totem-pl-parser -, wrapGAppsHook, itstool, libxml2, vala, gnome3 +, wrapGAppsHook, itstool, libxml2, vala, gnome3, grilo, grilo-plugins +, libpeas, adwaita-icon-theme, gnome-desktop, gsettings-desktop-schemas , gdk_pixbuf, tracker, nautilus }: stdenv.mkDerivation rec { @@ -15,15 +16,15 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobject-introspection wrapGAppsHook ]; buildInputs = [ - gtk3 glib gnome3.grilo clutter-gtk clutter-gst totem-pl-parser gnome3.grilo-plugins + gtk3 glib grilo clutter-gtk clutter-gst totem-pl-parser grilo-plugins gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info - gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop - gnome3.gsettings-desktop-schemas tracker nautilus + gst_all_1.gst-plugins-ugly gst_all_1.gst-libav libpeas shared-mime-info + gdk_pixbuf libxml2 adwaita-icon-theme gnome-desktop + gsettings-desktop-schemas tracker nautilus python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins ]; diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 7127ab71b1fc..85bb32972f4b 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt +{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt, gexiv2, tracker , meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server , exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif , libgrss, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid @@ -35,9 +35,9 @@ in stdenv.mkDerivation rec { flac giflib glib - gnome3.gexiv2 + gexiv2 totem-pl-parser - gnome3.tracker + tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix index 6ec2b0a17edb..b3f06c2dcc1c 100644 --- a/pkgs/desktops/gnome-3/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/core/vino/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool wrapGAppsHook pkgconfig ]; buildInputs = [ - gnome3.defaultIconTheme gtk3 glib libXtst libnotify libsoup + gnome3.adwaita-icon-theme gtk3 glib libXtst libnotify libsoup libsecret gnutls libgcrypt avahi zlib libjpeg libXdamage libXfixes libXext networkmanager ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ]; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 26bcb3171902..644c27938318 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib webkitgtk sqlite libxml2 libxslt gnome3.yelp-xsl - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index e80c437afdae..a347c8f2f9db 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3 +{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3, gtk3 , gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -10,18 +10,21 @@ stdenv.mkDerivation rec { sha256 = "1wipnp46pd238z9ck5rsckbaw7yla6c936fswq5w94k4c6bgcplr"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "zenity"; attrPath = "gnome3.zenity"; }; - }; - preBuild = '' mkdir -p $out/include ''; - buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; + buildInputs = [ gtk3 libxml2 libxslt libX11 itstool ]; nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which wrapGAppsHook ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "zenity"; + attrPath = "gnome3.zenity"; + }; + }; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 34b3faf71a41..41b0ccf6268c 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -28,7 +28,7 @@ lib.makeScope pkgs.newScope (self: with self; { gtk3.out # for gtk-update-icon-cache glib-networking gvfs dconf gnome-backgrounds gnome-control-center gnome-menus gnome-settings-daemon gnome-shell - gnome-themes-extra defaultIconTheme gnome-shell-extensions + gnome-themes-extra adwaita-icon-theme gnome-shell-extensions pkgs.hicolor-icon-theme ]; @@ -51,22 +51,11 @@ lib.makeScope pkgs.newScope (self: with self; { hitori gnome-taquin ]; - inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 - libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 - easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; - libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; gnome3 = self // { recurseForDerivations = false; }; - gtk = gtk3; - gtkmm = gtkmm3; vala = pkgs.vala_0_42; - gegl_0_4 = pkgs.gegl_0_4.override { inherit gtk; }; - rest = librest; - -# Simplify the nixos module and gnome packages - defaultIconTheme = adwaita-icon-theme; + gegl_0_4 = pkgs.gegl_0_4.override { gtk = pkgs.gtk3; }; # ISO installer # installerIso = callPackage ./installer.nix {}; @@ -372,8 +361,8 @@ lib.makeScope pkgs.newScope (self: with self; { bijiben = gnome-notes; # added 2018-09-26 evolution_data_server = evolution-data-server; # added 2018-02-25 - geocode_glib = geocode-glib; # added 2018-02-25 - glib_networking = glib-networking; # added 2018-02-25 + geocode_glib = pkgs.geocode-glib; # added 2018-02-25 + glib_networking = pkgs.glib-networking; # added 2018-02-25 gnome_common = gnome-common; # added 2018-02-25 gnome_control_center = gnome-control-center; # added 2018-02-25 gnome_desktop = gnome-desktop; # added 2018-02-25 @@ -399,4 +388,13 @@ lib.makeScope pkgs.newScope (self: with self; { yelp_xsl = yelp-xsl; # added 2018-02-25 yelp_tools = yelp-tools; # added 2018-02-25 + # added 2019-02-08 + inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 + libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 + easytag meld orca rhythmbox shotwell gnome-usage + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; + defaultIconTheme = adwaita-icon-theme; + gtk = gtk3; + gtkmm = gtkmm3; + rest = librest; }) diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 052cd49998d1..4a634de94478 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobject-introspection python3 ]; buildInputs = [ glib gtk3 webkitgtk amtk - gnome3.defaultIconTheme gsettings-desktop-schemas + gnome3.adwaita-icon-theme gsettings-desktop-schemas ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix index c8440037d3c9..9fbce7c6cc02 100644 --- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix +++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb, - boost, sqlite, libgtop, glibmm, gtkmm, vte, gtksourceview, gsettings-desktop-schemas, + boost, sqlite, libgtop, glibmm, gtkmm3, vte, gtksourceview, gsettings-desktop-schemas, gtksourceviewmm, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 gdb boost sqlite libgtop - glibmm gtkmm vte gtksourceview gtksourceviewmm + glibmm gtkmm3 vte gtksourceview gtksourceviewmm gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix index b8171ef31856..33980f2d0357 100644 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ]; - buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 4e302e9f8b11..a3bb2df918ae 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 python3 wrapGAppsHook ]; buildInputs = [ - gtk3 librsvg libgnome-games-support gnome3.defaultIconTheme + gtk3 librsvg libgnome-games-support gnome3.adwaita-icon-theme ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 110e2e5c4393..8955bcbc4984 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 ]; - buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.adwaita-icon-theme ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index dca598ce3141..e46f4ea4fac2 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ]; - buildInputs = [ glib gtk3 librsvg gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 librsvg gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index 0b4d6d770b0d..ab1a54c0575f 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig vala wrapGAppsHook intltool itstool libxml2 appstream-glib desktop-file-utils ]; - buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.adwaita-icon-theme ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index 29763abba559..c64ee968f19f 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 7896595de187..6ec18e55cf0e 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # gobject-introspection for finding vapi files nativeBuildInputs = [ meson ninja vala gobject-introspection pkgconfig gettext itstool python3 libxml2 wrapGAppsHook ]; - buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgnome-games-support libgee ]; + buildInputs = [ gtk3 librsvg gnome3.adwaita-icon-theme libgnome-games-support libgee ]; postPatch = '' chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index e36ca2a639d1..ad522c4f56a9 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; buildInputs = [ - gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme + gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.adwaita-icon-theme libgee libgnome-games-support ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index 19a6b60fb5bd..b881dbbf8009 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3 - libxml2 gnome3.defaultIconTheme libgnome-games-support libgee + libxml2 gnome3.adwaita-icon-theme libgnome-games-support libgee ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index eaa9f3a1c8dc..0996b9bf10b4 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, vala, pkgconfig, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook -, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: +, libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: stdenv.mkDerivation rec { name = "gnome-sudoku-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ gtk3 gnome3.libgee json-glib qqwing ]; + buildInputs = [ gtk3 libgee json-glib qqwing ]; postPatch = '' chmod +x post_install.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 75f511b17d05..583072d84703 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook librsvg libcanberra-gtk3 - intltool itstool libxml2 gnome3.defaultIconTheme + intltool itstool libxml2 gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index fe81b429e999..f3f1fdbc415c 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme + gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index 8d4be7f1c6b0..ebbbe9d1ceee 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook intltool itstool libxml2 - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index a60ebe9590bc..b1996e0fd593 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool libxml2 ]; - buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg libcanberra-gtk3 ]; + buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libcanberra-gtk3 ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index ccd90c071fee..bbc65f3e5ba0 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2 meson ninja python3 ]; - buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg clutter clutter-gtk ]; + buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg clutter clutter-gtk ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index c57ab1a9e14d..d3ddcea77f7d 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; buildInputs = [ - gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libcanberra-gtk3 clutter libxml2 clutter-gtk ]; diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index 5e0f01174e41..3c017d713821 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ]; - buildInputs = [ glib gtk3 gnome3.defaultIconTheme clutter clutter-gtk ]; + buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme clutter clutter-gtk ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index e6cdd3c88b72..399562c0d99d 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libxml2 itstool intltool wrapGAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 8f1080ccc2e0..be9fbe943be3 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_40, enchant , wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils , libnotify, libcanberra-gtk3, libsecret, gmime, isocodes -, gobject-introspection, libpthreadstubs, sqlite, gcr +, gobject-introspection, libpthreadstubs, sqlite, gcr, libgee +, gsettings-desktop-schemas, adwaita-icon-theme , gnome3, librsvg, gnome-doc-utils, webkitgtk, fetchpatch }: let @@ -40,9 +41,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobject-introspection ]; buildInputs = [ - gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings-desktop-schemas gcr isocodes - gdk_pixbuf librsvg gnome3.defaultIconTheme + gtk3 enchant webkitgtk libnotify libcanberra-gtk3 libgee libsecret gmime sqlite + libpthreadstubs gsettings-desktop-schemas gcr isocodes + gdk_pixbuf librsvg adwaita-icon-theme ]; cmakeFlags = [ diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index a447d2aa5903..9f24d04337c2 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, fetchpatch, vala, intltool, pkgconfig, gtk3, glib , json-glib, wrapGAppsHook, libpeas, bash, gobject-introspection +, libsoup, gtksourceview, gsettings-desktop-schemas, adwaita-icon-theme , gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret , meson, ninja, python3 }: @@ -35,9 +36,9 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ - gtk3 glib json-glib libgee libpeas gnome3.libsoup - libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas - libsecret gobject-introspection gnome3.adwaita-icon-theme + gtk3 glib json-glib libgee libpeas libsoup + libgit2-glib gtkspell3 gtksourceview gsettings-desktop-schemas + libsecret gobject-introspection adwaita-icon-theme ]; nativeBuildInputs = [ meson ninja python3 vala wrapGAppsHook intltool pkgconfig ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index 716988252d54..f9387c11b819 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -10,7 +10,7 @@ , gnome-session , gnome3 , gsettings-desktop-schemas -, gtk +, gtk3 , ibus , intltool , libcanberra-gtk3 @@ -85,7 +85,7 @@ let gnome-bluetooth gnome-desktop gsettings-desktop-schemas - gtk + gtk3 ibus libcanberra-gtk3 libpulseaudio diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index 8fbe24220b69..3cdab30ce8d1 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, packagekit, polkit -, systemd, wrapGAppsHook, desktop-file-utils }: +, gtk3, systemd, wrapGAppsHook, desktop-file-utils }: stdenv.mkDerivation rec { name = "gnome-packagekit-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ]; - buildInputs = [ gnome3.gtk packagekit systemd polkit ]; + buildInputs = [ gtk3 packagekit systemd polkit ]; postPatch = '' patchShebangs meson_post_install.sh diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index f9cc0a8aa4f9..db00758fb55f 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -11,7 +11,7 @@ , gnome-flashback , gnome-menus , gnome3 -, gtk +, gtk3 , itstool , libgweather , libsoup @@ -77,7 +77,7 @@ in stdenv.mkDerivation rec { glib gnome-desktop gnome-menus - gtk + gtk3 libgweather libsoup libwnck3 diff --git a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix index be8ab81457ea..5afc92aa482b 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix @@ -7,7 +7,7 @@ , gnome-common , gnome-desktop , gnome3 -, gtk +, gtk3 , gsettings-desktop-schemas , pkgconfig , intltool @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gtk + gtk3 gnome-desktop dbus-glib pam diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index 77edf27fbdd6..47de1de59cac 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas - gdk_pixbuf gnome3.defaultIconTheme + gdk_pixbuf gnome3.adwaita-icon-theme libnotify gnome3.gnome-shell python3Packages.pygobject3 libsoup gnome3.gnome-settings-daemon gnome3.nautilus gnome3.mutter gnome3.gnome-desktop gobject-introspection diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index 86e12b585364..c42356aa16aa 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -4,7 +4,7 @@ , glib , gnome3 , gsettings-desktop-schemas -, gtk +, gtk3 , libcanberra-gtk3 , libgtop , libstartup_notification @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib gsettings-desktop-schemas - gtk + gtk3 libcanberra-gtk3 libgtop libstartup_notification diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index 0a9b9bcfe9be..c77d5d89fe33 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dbus-glib libcanberra gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings-desktop-schemas - gnome3.gnome-shell gtk3 gnome3.defaultIconTheme + gnome3.gnome-shell gtk3 gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index abb1b8c28a1b..d71bb08dd5cb 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { python gnome3.gtksourceview gnome3.libpeas - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme mate.mate-desktop ]; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 99ca20afe988..3829cf551f7f 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -1,5 +1,6 @@ { fetchurl, fetchgit, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst , libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit +, geocode-glib, gtk3 , geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager , docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss, pantheon, accountsservice }: @@ -75,16 +76,16 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = with gnome3; [ + buildInputs = [ accountsservice alsaLib colord geoclue2 geocode-glib glib - gnome-desktop - gsettings-desktop-schemas - gtk + gnome3.gnome-desktop + gnome3.gsettings-desktop-schemas + gtk3 ibus lcms2 libXtst diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index cf5ba1d6ad4b..2345bfbc5c08 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -286,7 +286,7 @@ self: super: builtins.intersectAttrs super { # Tries to run GUI in tests leksah = dontCheck (overrideCabal super.leksah (drv: { executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [ - gnome3.defaultIconTheme # Fix error: Icon 'window-close' not present in theme ... + gnome3.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed ]); diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f82f49dd8912..abfdb0801b2b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -34296,7 +34296,7 @@ self: { description = "BDCS API Server"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) libgit2-glib;}; + }) {inherit (pkgs) libgit2-glib;}; "bdd" = callPackage ({ mkDerivation, base, directory, HUnit, mtl, process @@ -85978,7 +85978,7 @@ self: { doHaddock = false; description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs) libdbusmenu-gtk3;}; + }) {gtk3 = pkgs.gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -85999,7 +85999,7 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Gdk bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "gi-gdkpixbuf" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf @@ -86040,7 +86040,7 @@ self: { doHaddock = false; description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "gi-ggit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -86060,7 +86060,7 @@ self: { doHaddock = false; description = "libgit2-glib bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome3) libgit2-glib;}; + }) {inherit (pkgs) libgit2-glib;}; "gi-gio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -86099,7 +86099,7 @@ self: { doHaddock = false; description = "GIRepository (gobject-introspection) bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome3) gobject-introspection;}; + }) {inherit (pkgs) gobject-introspection;}; "gi-glib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib @@ -86283,7 +86283,7 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "gi-gtk-declarative" = callPackage ({ mkDerivation, base, criterion, gi-gdk, gi-glib, gi-gobject @@ -86381,7 +86381,7 @@ self: { doHaddock = false; description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; + }) {gtksourceview3 = pkgs.gtksourceview;}; "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -86402,7 +86402,7 @@ self: { description = "JavaScriptCore bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) webkitgtk;}; + }) {inherit (pkgs) webkitgtk;}; "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf @@ -86533,7 +86533,7 @@ self: { doHaddock = false; description = "Libsecret bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome3) libsecret;}; + }) {inherit (pkgs) libsecret;}; "gi-soup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -86574,7 +86574,7 @@ self: { libraryPkgconfigDepends = [ vte_291 ]; description = "Vte bindings"; license = stdenv.lib.licenses.lgpl21; - }) {vte_291 = pkgs.gnome3.vte;}; + }) {vte_291 = pkgs.vte;}; "gi-webkit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -86620,7 +86620,7 @@ self: { description = "WebKit2 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) webkitgtk;}; + }) {inherit (pkgs) webkitgtk;}; "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -93206,7 +93206,7 @@ self: { description = "A standalone StatusNotifierItem/AppIndicator tray"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "gtk-strut" = callPackage ({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }: @@ -93545,7 +93545,7 @@ self: { description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; + }) {gtksourceview3 = pkgs.gtksourceview;}; "guarded-allocation" = callPackage ({ mkDerivation, base }: @@ -99232,8 +99232,7 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; - inherit (pkgs.gnome3) gobject-introspection;}; + }) {inherit (pkgs) glib gobject-introspection;}; "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: @@ -133830,7 +133829,7 @@ self: { description = "Haskell IDE written in Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "leksah-server" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, binary @@ -139415,7 +139414,7 @@ self: { description = "Leksah tool kit"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "ltl" = callPackage ({ mkDerivation, base, vcd }: @@ -205341,7 +205340,7 @@ self: { description = "Binding to the libsvg-cairo library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) librsvg;}; + }) {inherit (pkgs) librsvg;}; "svgutils" = callPackage ({ mkDerivation, base, filepath, xml }: @@ -207154,7 +207153,7 @@ self: { description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "tag-bits" = callPackage ({ mkDerivation, base, ghc-prim }: @@ -209964,7 +209963,7 @@ self: { description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk; vte_291 = pkgs.gnome3.vte;}; + }) {gtk3 = pkgs.gtk3; vte_291 = pkgs.vte;}; "termplot" = callPackage ({ mkDerivation, base, brick, data-default, optparse-applicative @@ -212903,7 +212902,7 @@ self: { description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs.gnome3) webkitgtk;}; + }) {gtk3 = pkgs.gtk3; inherit (pkgs) webkitgtk;}; "tibetan-utils" = callPackage ({ mkDerivation, base, composition-prelude, either, hspec @@ -228411,7 +228410,7 @@ self: { description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) webkitgtk;}; + }) {inherit (pkgs) webkitgtk;}; "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 8ef8353e4e0c..cb22c9ee790b 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, gtk3 , pkgconfig, gnome3, dbus, xvfb_run }: let version = "5.0.0"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - gnome3.gtk + gtk3 ]; doCheck = stdenv.isLinux; diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index dc98de1c2cb6..e147a05d3cd8 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -55,7 +55,7 @@ in ++ stdenv.lib.optional enableUsb libusb ++ stdenv.lib.optional enablePacketSocket audit ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] - ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.defaultIconTheme ]; + ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.adwaita-icon-theme ]; preAutoreconf = ''./autogen.sh''; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index cb7f2621353d..0fdf0a09be6c 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which , librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw -, libwebp, gnome3, libintl }: +, gexiv2, libwebp, gnome3, libintl }: let version = "0.4.12"; @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libpng cairo libjpeg librsvg pango gtk bzip2 - libraw libwebp gnome3.gexiv2 + libraw libwebp gexiv2 ]; propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-4.0.pc diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index 2d308add87ad..ebb9b354ff1d 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib }: +{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }: stdenv.mkDerivation rec { pname = "geocode-glib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a"; }; - nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; - buildInputs = with gnome3; [ glib libsoup json-glib ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; + buildInputs = [ glib libsoup json-glib ]; patches = [ ./installed-tests-path.patch diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 9bf03f25c9c9..cab04438dd38 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee , overrideCC, gcc6 , mysqlSupport ? false, mysql ? null , postgresSupport ? false, postgresql ? null @@ -24,7 +24,7 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ]; - buildInputs = with stdenv.lib; [ gtk3 openssl gnome3.libgee ] + buildInputs = with stdenv.lib; [ gtk3 openssl libgee ] ++ optional (mysqlSupport) mysql.connector-c ++ optional (postgresSupport) postgresql; diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index f22cc568a97c..3f20236d17f4 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; - buildInputs = with gnome3; - [ libsoup libxml2 glib liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ]; + buildInputs = [ gnome3.libsoup libxml2 glib liboauth gcr gnome3.gnome-online-accounts p11-kit openssl uhttpmock ]; propagatedBuildInputs = [ json-glib ]; diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 981ec2f0a3a5..a1e7215fd9a2 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,4 +1,4 @@ -{ cairo, fetchzip, glib, gnome3, gobject-introspection, pkgconfig, stdenv }: +{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }: stdenv.mkDerivation rec { name = "osm-gps-map-${version}"; @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib gobject-introspection - ] ++ (with gnome3; [ - gnome-common gtk libsoup - ]); + gnome3.gnome-common gtk3 gnome3.libsoup + ]; meta = with stdenv.lib; { description = "Gtk+ widget for displaying OpenStreetMap tiles"; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index ae27ff72c844..b96f65c2ecc2 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -14,7 +14,7 @@ in python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ]; - buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 gobject-introspection ]; + buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme libwnck3 gobject-introspection ]; propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ]; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 8cd6a3f09eef..b2f7b52d325f 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { pkgconfig shared-mime-info wrapGAppsHook - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ]; diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index 64b485bea310..87893a931363 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -6,7 +6,7 @@ let pkg = import ./base.nix { }; in callPackage pkg { buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper - gnome3.defaultIconTheme gdk_pixbuf librsvg intltool ]; + gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool ]; drvParams = { postFixup = '' wrapProgram $out/bin/image-analyzer \ diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index 9403a969e8f4..14560919b71a 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -8,7 +8,7 @@ let inherit (pythonPackages) python pygobject3; in callPackage pkg { buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper - gnome3.defaultIconTheme gdk_pixbuf librsvg ]; + gnome3.adwaita-icon-theme gdk_pixbuf librsvg ]; drvParams = { postFixup = '' wrapProgram $out/bin/gcdemu \ diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 9be17ade149e..288201e804aa 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; - buildInputs = [ gtk3 glib gnome3.defaultIconTheme python3 ]; + buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ]; propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ]; postPatch = '' diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 8fed569f140f..f611055a4341 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.defaultIconTheme + makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.adwaita-icon-theme librsvg wrapGAppsHook ]; diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 41b3b15738d6..cb6853c9a443 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; buildInputs = [ - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 85713a300ec6..3115b1b72439 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { # needed for GSETTINGS_SCHEMAS_PATH gsettings-desktop-schemas glib gnome3.gtk # needed for XDG_ICON_DIRS - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme makeWrapper (stdenv.lib.getLib gnome3.dconf) ] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp]; @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/luxcoreui" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' \ + --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" ''; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index 7943903d6f7c..e10ffae4a51e 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper fcitx cmake isocodes gtk3 - gnome3.defaultIconTheme ]; + gnome3.adwaita-icon-theme ]; preFixup = '' wrapProgram $out/bin/fcitx-config-gtk3 \ diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index cef5c5538a78..80ea61249c63 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook ]; - buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gtksourceview4 gnome3.defaultIconTheme ]; + buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gtksourceview4 gnome3.adwaita-icon-theme ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index f3fe14e4f246..3c9a34d524a0 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43 , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas -, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3 +, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3, gtk3 , libappindicator-gtk3, withGnome ? false, gcr }: let @@ -25,10 +25,10 @@ in stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "devdoc" "man" ]; buildInputs = [ - gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas + gtk3 networkmanager libnotify libsecret gsettings-desktop-schemas polkit isocodes mobile-broadband-provider-info libgudev modemmanager jansson glib-networking - libappindicator-gtk3 gnome3.defaultIconTheme + libappindicator-gtk3 gnome3.adwaita-icon-theme ] ++ stdenv.lib.optionals withGnome [ gcr ]; # advanced certificate chooser nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobject-introspection python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ]; diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index facf1b6a6670..1fcbce28cc44 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, +{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, gtk3, networkmanager, ppp, libsecret, withGnome ? true, gnome3 }: let @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openfortivpn networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index ad58dc97b0a6..d3eb3f799336 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret +{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3 , withGnome ? true, gnome3 }: let @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ iodine networkmanager ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index b44933f7f5f8..5fc591f0a43d 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -1,5 +1,5 @@ { stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig -, networkmanager, ppp, xl2tpd, strongswan, libsecret +, gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret , withGnome ? true, gnome3, networkmanagerapplet }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix index 0c02569aa27a..566179d85b36 100644 --- a/pkgs/tools/networking/network-manager/openconnect/default.nix +++ b/pkgs/tools/networking/network-manager/openconnect/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, kmod }: +, gtk3, withGnome ? true, gnome3, kmod }: let pname = "NetworkManager-openconnect"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openconnect networkmanager ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 952bbf4999e3..3fe4db870360 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret -, withGnome ? true, gnome3, kmod }: +, gtk3, withGnome ? true, gnome3, kmod }: let pname = "NetworkManager-openvpn"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openvpn networkmanager ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig file libxml2 ]; diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix index 5d77be86dffe..3231c276be5b 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, kmod, file }: +, gtk3, withGnome ? true, gnome3, kmod, file }: let pname = "NetworkManager-vpnc"; version = "1.2.6"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ vpnc networkmanager ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig file ]; diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 81164c1eb77f..88076abc4f6b 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, defaultIconTheme }: +{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, gnome3 }: pythonPackages.buildPythonApplication rec { name = "onioncircuits-${version}"; @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { postFixup = '' wrapProgram "$out/bin/onioncircuits" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:${defaultIconTheme}/share" + --prefix XDG_DATA_DIRS : "$out/share:${gnome3.adwaita-icon-theme}/share" ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54836458cc13..91c84839a4c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1985,7 +1985,7 @@ in ibus = callPackage ../tools/inputmethods/ibus { gconf = gnome2.GConf; - inherit (gnome3) dconf glib; + inherit (gnome3) dconf; }; ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; @@ -4551,9 +4551,7 @@ in omping = callPackage ../applications/networking/omping { }; - onioncircuits = callPackage ../tools/security/onioncircuits { - inherit (gnome3) defaultIconTheme; - }; + onioncircuits = callPackage ../tools/security/onioncircuits { }; openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { }; @@ -5157,7 +5155,6 @@ in remind = callPackage ../tools/misc/remind { }; remmina = callPackage ../applications/networking/remote/remmina { - adwaita-icon-theme = gnome3.adwaita-icon-theme; gsettings-desktop-schemas = gnome3.gsettings-desktop-schemas; }; @@ -5324,9 +5321,7 @@ in quazip = quazip_qt4; }; - screenkey = python2Packages.callPackage ../applications/video/screenkey { - inherit (gnome3) defaultIconTheme; - }; + screenkey = python2Packages.callPackage ../applications/video/screenkey { }; quazip_qt4 = libsForQt5.quazip.override { qtbase = qt4; qmake = qmake4Hook; @@ -5803,9 +5798,7 @@ in tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; - tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { - inherit (gnome3) defaultIconTheme; - }; + tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle { stdenv = stdenvNoCC; @@ -12158,7 +12151,8 @@ in inherit perl; inherit (darwin) cf-private; inherit (gst_all_1) gstreamer gst-plugins-base; - inherit (gnome3) gtk3 dconf; + inherit gtk3; + inherit (gnome3) dconf; }); libsForQt59 = lib.makeScope qt59.newScope mkLibsForQt5; @@ -12173,7 +12167,8 @@ in inherit libGL; inherit perl; inherit (darwin) cf-private; - inherit (gnome3) gtk3 dconf; + inherit gtk3; + inherit (gnome3) dconf; inherit (gst_all_1) gstreamer gst-plugins-base; }); @@ -12189,7 +12184,8 @@ in inherit libGL; inherit perl; inherit (darwin) cf-private; - inherit (gnome3) gtk3 dconf; + inherit gtk3; + inherit (gnome3) dconf; inherit (gst_all_1) gstreamer gst-plugins-base; }); @@ -14983,9 +14979,7 @@ in nvme-cli = callPackage ../os-specific/linux/nvme-cli { }; - open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { - inherit (gnome3) gtk gtkmm; - }; + open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; delve = callPackage ../development/tools/delve { }; @@ -16022,9 +16016,7 @@ in inherit (pythonPackages) eyeD3; }; - abiword = callPackage ../applications/office/abiword { - iconTheme = gnome3.defaultIconTheme; - }; + abiword = callPackage ../applications/office/abiword { }; abook = callPackage ../applications/misc/abook { }; @@ -16654,9 +16646,7 @@ in devede = callPackage ../applications/video/devede { }; - denemo = callPackage ../applications/audio/denemo { - inherit (gnome3) gtksourceview; - }; + denemo = callPackage ../applications/audio/denemo { }; dvb_apps = callPackage ../applications/video/dvb-apps { }; @@ -17246,7 +17236,6 @@ in generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; - inherit (pkgs.gnome3) defaultIconTheme; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { @@ -17261,7 +17250,6 @@ in generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; - inherit (pkgs.gnome3) defaultIconTheme; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { @@ -17276,7 +17264,6 @@ in generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; - inherit (pkgs.gnome3) defaultIconTheme; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { @@ -17509,7 +17496,7 @@ in gnome-mpv = callPackage ../applications/video/gnome-mpv { }; gnome-recipes = callPackage ../applications/misc/gnome-recipes { - inherit (gnome3) gnome-online-accounts rest gnome-autoar gspell; + inherit (gnome3) gnome-online-accounts gnome-autoar; }; gollum = callPackage ../applications/misc/gollum { }; @@ -18033,7 +18020,6 @@ in libreoffice-args = { inherit (perlPackages) ArchiveZip IOCompress; inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) defaultIconTheme; zip = zip.override { enableNLS = false; }; fontsConf = makeFontsConf { fontDirectories = [ @@ -18555,7 +18541,6 @@ in }; synfigstudio = callPackage ../applications/graphics/synfigstudio { - inherit (gnome3) defaultIconTheme; mlt-qt5 = libsForQt5.mlt; }; @@ -18891,9 +18876,7 @@ in pinfo = callPackage ../applications/misc/pinfo { }; - pinpoint = callPackage ../applications/office/pinpoint { - inherit (gnome3) clutter clutter-gtk; - }; + pinpoint = callPackage ../applications/office/pinpoint { }; pinta = callPackage ../applications/graphics/pinta { gtksharp = gtk-sharp-2_0; @@ -19091,7 +19074,7 @@ in quodlibet-xine = quodlibet.override { xineBackend = true; tag = "-xine"; }; quodlibet-full = quodlibet.override { - inherit (gnome3) gtksourceview webkitgtk; + inherit gtksourceview webkitgtk; withDbusPython = true; withPyInotify = true; withMusicBrainzNgs = true; @@ -19677,7 +19660,6 @@ in thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; - inherit (pkgs.gnome3) defaultIconTheme; }; tig = gitAndTools.tig; @@ -19838,9 +19820,7 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - vimiv = callPackage ../applications/graphics/vimiv { - inherit (gnome3) defaultIconTheme; - }; + vimiv = callPackage ../applications/graphics/vimiv { }; macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; }; @@ -22115,9 +22095,7 @@ in bcal = callPackage ../applications/science/math/bcal { }; - pspp = callPackage ../applications/science/math/pspp { - inherit (gnome3) gtksourceview; - }; + pspp = callPackage ../applications/science/math/pspp { }; pynac = callPackage ../applications/science/math/pynac { }; @@ -22432,7 +22410,6 @@ in gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav gst-plugins-ugly; - inherit (gnome3) gspell defaultIconTheme; }; gammu = callPackage ../applications/misc/gammu { }; @@ -23149,9 +23126,7 @@ in xosview2 = callPackage ../tools/X11/xosview2 { }; - xpad = callPackage ../applications/misc/xpad { - inherit (gnome3) gtksourceview; - }; + xpad = callPackage ../applications/misc/xpad { }; xsane = callPackage ../applications/graphics/sane/xsane.nix { libpng = libpng12; @@ -23262,9 +23237,7 @@ in iterm2 = callPackage ../applications/misc/iterm2 {}; - sequeler = callPackage ../applications/misc/sequeler { - inherit (gnome3) gtksourceview libgda; - }; + sequeler = callPackage ../applications/misc/sequeler { }; sequelpro = callPackage ../applications/misc/sequelpro {};