diff options
Diffstat (limited to 'pkgs/desktops/gnome-3/apps')
22 files changed, 57 insertions, 50 deletions
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 310f8ccb63b9..fa406e6f4dbb 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 = "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h"; }; - 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..98d3cfb55398 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -17,8 +17,8 @@ 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 + gtk3 glib libmediaart gnome-online-accounts gobject-introspection + 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"; |