From 66c3dff47c86c7288f6801fc4bab907b351da96c Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 20 Aug 2015 23:32:07 +0200 Subject: [PATCH] gnome3: Depend on defaultIconTheme instead of hicolor- or adwaita --- pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix | 7 +++---- pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix | 6 +++--- pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/apps/glade/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix | 6 +++--- pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix | 6 +++--- .../gnome-3/3.16/apps/gnome-documents/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix | 7 +++---- pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix | 6 +++--- pkgs/desktops/gnome-3/3.16/core/baobab/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/core/empathy/default.nix | 6 +++--- pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix | 4 ++-- .../gnome-3/3.16/core/gnome-calculator/default.nix | 5 ++--- .../desktops/gnome-3/3.16/core/gnome-contacts/default.nix | 5 ++--- .../gnome-3/3.16/core/gnome-control-center/default.nix | 2 +- .../gnome-3/3.16/core/gnome-dictionary/default.nix | 5 ++--- .../gnome-3/3.16/core/gnome-disk-utility/default.nix | 5 ++--- .../gnome-3/3.16/core/gnome-font-viewer/default.nix | 5 ++--- .../gnome-3/3.16/core/gnome-online-accounts/default.nix | 4 ++-- .../gnome-3/3.16/core/gnome-screenshot/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix | 4 ++-- .../gnome-3/3.16/core/gnome-shell-extensions/default.nix | 6 ++---- .../gnome-3/3.16/core/gnome-system-log/default.nix | 5 ++--- .../gnome-3/3.16/core/gnome-system-monitor/default.nix | 5 ++--- .../gnome-3/3.16/core/gnome-themes-standard/default.nix | 4 ++-- .../gnome-3/3.16/core/gnome-user-share/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix | 6 +++--- pkgs/desktops/gnome-3/3.16/core/sushi/default.nix | 8 ++++---- pkgs/desktops/gnome-3/3.16/core/totem/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/core/tracker/default.nix | 7 +++---- pkgs/desktops/gnome-3/3.16/core/vino/default.nix | 7 +++---- pkgs/desktops/gnome-3/3.16/core/yelp/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix | 4 ++-- .../desktops/gnome-3/3.16/games/four-in-a-row/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix | 4 ++-- .../desktops/gnome-3/3.16/games/gnome-klotski/default.nix | 4 ++-- .../gnome-3/3.16/games/gnome-mahjongg/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix | 4 ++-- .../desktops/gnome-3/3.16/games/gnome-nibbles/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix | 5 ++--- .../gnome-3/3.16/games/gnome-tetravex/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/games/hitori/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/misc/geary/default.nix | 6 +++--- .../gnome-3/3.16/misc/gnome-tweak-tool/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix | 6 +++--- 53 files changed, 119 insertions(+), 145 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix index 294793d6af75..c8d33c24156c 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook , itstool, libxml2, python3, python3Packages, pyatspi, at_spi2_core -, dbus, intltool, libwnck3, hicolor_icon_theme }: +, dbus, intltool, libwnck3 }: stdenv.mkDerivation rec { name = "accerciser-3.14.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3 pyatspi python3Packages.pygobject3 python3Packages.ipythonLight - at_spi2_core dbus intltool libwnck3 hicolor_icon_theme + at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme ]; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix index 5eb922994ee4..99ea481307e7 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, pkgconfig, glib , evolution_data_server, evolution, sqlite -, hicolor_icon_theme, makeWrapper, itstool, desktop_file_utils +, makeWrapper, itstool, desktop_file_utils , clutter_gtk, libuuid, webkitgtk, zeitgeist , gnome3, librsvg, gdk_pixbuf, libxml2 }: @@ -20,9 +20,8 @@ stdenv.mkDerivation rec { clutter_gtk libuuid webkitgtk gnome3.tracker gnome3.gnome_online_accounts zeitgeist desktop_file_utils gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.adwaita-icon-theme librsvg - evolution_data_server evolution sqlite - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + gdk_pixbuf gnome3.defaultIconTheme librsvg + evolution_data_server evolution sqlite ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix index a77fe574709f..d77740d35075 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight -, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify, gtkspell3 +, pkgconfig, gtk3, glib, libnotify, gtkspell3 , makeWrapper, itstool, shared_mime_info, libical, db, gcr, sqlite , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool , libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }: @@ -21,12 +21,11 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gnome3.gtkhtml ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - gdk_pixbuf gnome3.adwaita-icon-theme librsvg db icu + 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 gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit - hicolor_icon_theme gnome3.adwaita-icon-theme nss nspr libnotify procps highlight gnome3.libgweather gnome3.gsettings_desktop_schemas makeWrapper ]; diff --git a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix index 122449eb4f5f..88ced2b2b065 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive -, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf, hicolor_icon_theme }: +, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { name = "file-roller-${version}"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive - hicolor_icon_theme gnome3.adwaita-icon-theme - attr bzip2 acl gdk_pixbuf librsvg makeWrapper ]; + gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg + makeWrapper ]; preFixup = '' wrapProgram "$out/bin/file-roller" \ diff --git a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix index 9263fd424767..c046dd7dc9bf 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, enchant, isocodes -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , bash, makeWrapper, itstool, libsoup, libxml2 , gnome3, librsvg, gdk_pixbuf, file }: @@ -14,9 +14,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes - gdk_pixbuf gnome3.adwaita-icon-theme librsvg libsoup + gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup gnome3.libpeas gnome3.gtksourceview libxml2 - hicolor_icon_theme gnome3.adwaita-icon-theme gnome3.gsettings_desktop_schemas makeWrapper file ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix index 24d7688e4de0..3ead4de8bc48 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, python -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , makeWrapper, itstool, libxml2, docbook_xsl , gnome3, librsvg, gdk_pixbuf, libxslt }: @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl - gdk_pixbuf gnome3.adwaita-icon-theme librsvg libxslt - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix index cc3640fd09f1..10eaa34a8a2b 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix @@ -2,7 +2,7 @@ , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala , libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg -, hicolor_icon_theme, desktop_file_utils, mtools, cdrkit, libcdio +, desktop_file_utils, mtools, cdrkit, libcdio , libusb, libarchive, acl }: @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { makeWrapper pkgconfig intltool itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp - gdbm cyrus_sasl gnome3.adwaita-icon-theme libusb libarchive - librsvg hicolor_icon_theme desktop_file_utils acl + gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive + librsvg desktop_file_utils acl ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix index 469581deef48..2308dd90434f 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, libgweather, libnotify -, pkgconfig, gtk3, glib, hicolor_icon_theme, gsound +, pkgconfig, gtk3, glib, gsound , makeWrapper, itstool, libcanberra_gtk3, libtool , gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }: @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.adwaita-icon-theme librsvg + gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop gnome3.geocode_glib geoclue2 libgweather libnotify libtool gsound - hicolor_icon_theme wrapGAppsHook ]; + wrapGAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix index 98059d3ed131..fe6be2e8d4ec 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, evince, gjs -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , makeWrapper, itstool, libxslt, webkitgtk , gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl , gobjectIntrospection, json_glib, inkscape, poppler_utils @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt docbook_xsl desktop_file_utils inkscape poppler_utils gnome3.gsettings_desktop_schemas makeWrapper gmp - gdk_pixbuf gnome3.adwaita-icon-theme librsvg evince + gdk_pixbuf gnome3.defaultIconTheme librsvg evince libsoup webkitgtk gjs gobjectIntrospection gnome3.rest gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts gnome3.gnome_desktop gnome3.libzapojit json_glib diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix index 23c77395a828..dbef0526b806 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libxml2, systemd, hicolor_icon_theme }: +, intltool, itstool, libxml2, systemd }: stdenv.mkDerivation rec { name = "gnome-logs-${gnome3.version}.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 - systemd hicolor_icon_theme + systemd gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix index 0193f00da4f5..3a6de4bcf6f4 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, gdk_pixbuf, tracker , python3, libxml2, python3Packages, libnotify, wrapGAppsHook -, pkgconfig, gtk3, glib, hicolor_icon_theme, cairo +, pkgconfig, gtk3, glib, cairo , makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: stdenv.mkDerivation rec { @@ -14,12 +14,11 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart - gdk_pixbuf gnome3.adwaita-icon-theme librsvg python3 + gdk_pixbuf gnome3.defaultIconTheme librsvg python3 gnome3.grilo gnome3.grilo-plugins libxml2 python3Packages.pygobject3 libnotify python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser - gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gstreamer gst_all_1.gst-plugins-base wrapGAppsHook gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - hicolor_icon_theme gnome3.adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas makeWrapper tracker ]; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix index 2b262c263ac4..4c152777f2cb 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libgtop, intltool, itstool, libxml2, hicolor_icon_theme -, nmap, inetutils }: +, libgtop, intltool, itstool, libxml2, nmap, inetutils }: stdenv.mkDerivation rec { name = "gnome-nettool-3.8.1"; @@ -12,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2 - hicolor_icon_theme + gnome3.defaultIconTheme ]; propagatedUserEnvPkgs = [ nmap inetutils ]; diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix index 83a732a01d50..a89cde7a111a 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, exempi, libxml2 -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , makeWrapper, itstool, gegl, babl, lcms2 , desktop_file_utils, gmp, libmediaart, wrapGAppsHook , gnome3, librsvg, gdk_pixbuf, libexif }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart - gdk_pixbuf gnome3.adwaita-icon-theme librsvg exempi + gdk_pixbuf gnome3.defaultIconTheme librsvg exempi gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo gnome3.gnome_online_accounts gnome3.gnome_desktop lcms2 libexif gnome3.tracker libxml2 desktop_file_utils diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix index fff9ea5c08b8..5fff782a2e8c 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs -, libgweather, intltool, itstool, hicolor_icon_theme }: +, libgweather, intltool, itstool }: stdenv.mkDerivation rec { name = "gnome-weather-${gnome3.version}.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook gjs intltool itstool - libgweather hicolor_icon_theme + libgweather gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix index 3e7b72373136..3a28507fac17 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, vala -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , makeWrapper, itstool, gnupg, libsoup , gnome3, librsvg, gdk_pixbuf, gpgme , libsecret, avahi, p11_kit, openssh }: @@ -22,9 +22,9 @@ in stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr gnome3.gsettings_desktop_schemas makeWrapper gnupg - gdk_pixbuf gnome3.adwaita-icon-theme librsvg gpgme + gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme libsecret avahi libsoup p11_kit vala gnome3.gcr - hicolor_icon_theme gnome3.adwaita-icon-theme openssh ]; + openssh ]; preFixup = '' wrapProgram "$out/bin/seahorse" \ diff --git a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix index eb93458ece58..54d2c065d94e 100644 --- a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, vala, libgtop -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , bash, makeWrapper, itstool, libxml2 , gnome3, librsvg, gdk_pixbuf, file }: @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + gdk_pixbuf gnome3.defaultIconTheme librsvg ]; preFixup = '' wrapProgram "$out/bin/baobab" \ diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix index 10e52fe92657..4c42c6c026d3 100644 --- a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf +, file, librsvg, gnome3, gdk_pixbuf , dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream , clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts , gcr, libsecret, folks, libpulseaudio, telepathy_mission_control @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf libnotify clutter libsoup gnutls libgee p11_kit libcanberra_gtk3 telepathy_farstream farstream - gnome3.adwaita-icon-theme hicolor_icon_theme - gnome3.gsettings_desktop_schemas file libtool librsvg ]; + gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas + file libtool librsvg ]; NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0" diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix index 72663122a542..5ec07d01b2e0 100644 --- a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix @@ -2,7 +2,7 @@ , bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool , webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit , sqlite, gcr, avahi, nss, isocodes, itstool, file, which -, hicolor_icon_theme, gdk_pixbuf, librsvg, gnome_common }: +, gdk_pixbuf, librsvg, gnome_common }: stdenv.mkDerivation rec { name = "epiphany-${gnome3.version}.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file webkitgtk libsoup libsecret gnome_desktop libnotify libtool sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools - gdk_pixbuf gnome3.adwaita-icon-theme librsvg which gnome_common + gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ]; NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix index 5ec87f1f8794..a13ca33fc81a 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, libxml2 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper +, bash, gtk3, glib, makeWrapper , itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp }: stdenv.mkDerivation rec { @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 gnome3.gtksourceview mpfr gmp - gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme + gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gsettings_desktop_schemas makeWrapper ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix index ea5a42433897..564913316847 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, evolution_data_server, db -, pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret +, pkgconfig, gtk3, glib, libsecret , libchamplain, clutter_gtk, geocode_glib , bash, makeWrapper, itstool, folks, libnotify, libxml2 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss @@ -26,9 +26,8 @@ stdenv.mkDerivation rec { gnome3.gsettings_desktop_schemas makeWrapper file libnotify folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib libxml2 libsoup gnome3.gnome_online_accounts nspr nss - gdk_pixbuf gnome3.adwaita-icon-theme librsvg + gdk_pixbuf gnome3.defaulticontheme librsvg libchamplain clutter_gtk geocode_glib - hicolor_icon_theme gnome3.adwaita-icon-theme vala automake115x autoconf db ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix index 0f95f322d13c..1dfc76a2dd54 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper , libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio -, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify +, gdk_pixbuf, librsvg, libxkbfile, libnotify , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, python, libkrb5, networkmanagerapplet, networkmanager , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix index 9917fd4d15c6..9e3906dbed13 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , bash, makeWrapper, itstool, libxml2 , gnome3, librsvg, gdk_pixbuf, file }: @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file gnome3.gsettings_desktop_schemas makeWrapper ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix index b5261c214ad1..ea29cda29612 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper, cracklib, libnotify +, bash, gtk3, glib, makeWrapper, cracklib, libnotify , itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python , libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: @@ -20,9 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxslt libtool libsecret libpwquality cracklib libnotify libdvdread libcanberra_gtk3 docbook_xsl - gdk_pixbuf gnome3.adwaita-icon-theme + gdk_pixbuf gnome3.defaultIconTheme librsvg udisks2 gnome3.gnome_settings_daemon - hicolor_icon_theme gnome3.adwaita-icon-theme gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix index 1523cf14d2e2..39d5e71a5a3e 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , bash, makeWrapper, itstool , gnome3, librsvg, gdk_pixbuf }: @@ -18,8 +18,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop - gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme + gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gsettings_desktop_schemas makeWrapper ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix index a8e877039b20..ac285819e8f4 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper , webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common , telepathy_glib, intltool, dbus_libs, icu, autoreconfHook -, libsoup, docbook_xsl_ns, docbook_xsl, gnome3, hicolor_icon_theme +, libsoup, docbook_xsl_ns, docbook_xsl, gnome3 }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper libsecret dbus_glib telepathy_glib intltool icu libsoup autoreconfHook - docbook_xsl_ns docbook_xsl hicolor_icon_theme ]; + docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; preFixup = '' for f in "$out/libexec/"*; do diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix index 559d084add19..c36e1b87d668 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper +, bash, gtk3, glib, makeWrapper , itstool, gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 gnome3.gsettings_desktop_schemas makeWrapper ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix index be1b4c0d2cde..bce31242dac0 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower -, libxslt, intltool, makeWrapper, systemd, xorg, hicolor_icon_theme }: +, libxslt, intltool, makeWrapper, systemd, xorg }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gnome3.gnome_settings_daemon xorg.xtrans hicolor_icon_theme + gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix index 1b17d1f1f53f..d4e5d807e483 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix @@ -1,7 +1,5 @@ -{ stdenv, intltool, fetchurl, libgtop -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool -, gnome3, file }: +{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib +, bash, makeWrapper, itstool, gnome3, file }: stdenv.mkDerivation rec { name = "gnome-shell-extensions-${gnome3.version}.1"; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix index 44af987dfe4f..716f92a072d4 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper +, bash, gtk3, glib, makeWrapper , itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: stdenv.mkDerivation rec { @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix index 94c7af904ddd..353c8fcf4dbe 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper +, bash, gtk3, glib, makeWrapper , itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: stdenv.mkDerivation rec { @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 gtkmm3 libgtop makeWrapper - gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme + gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gsettings_desktop_schemas ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix index ff12622d28f0..7bd689511d53 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 -, gdk_pixbuf, hicolor_icon_theme }: +, gdk_pixbuf }: stdenv.mkDerivation rec { name = "gnome-themes-standard-${gnome3.version}.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf - hicolor_icon_theme ]; + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix index 3d2011c01c68..381f7d7c4168 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus -, pkgconfig, gtk3, glib, hicolor_icon_theme, libxml2, gnused +, pkgconfig, gtk3, glib, libxml2, gnused , bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd , gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: @@ -27,8 +27,7 @@ in stdenv.mkDerivation rec { "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - makeWrapper file gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme + makeWrapper file gdk_pixbuf gnome3.defaultIconTheme librsvg nautilus libnotify libcanberra_gtk3 ]; postInstall = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix index 1787734939d1..cf3f06fef58a 100644 --- a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome3 -, glib, gtk3, gobjectIntrospection, python, pygobject3, hicolor_icon_theme +, glib, gtk3, gobjectIntrospection, python, pygobject3 }: let @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { version = "${majorVersion}.1"; buildInputs = [ - intltool pkgconfig - glib gtk3 gobjectIntrospection python pygobject3 hicolor_icon_theme + intltool pkgconfig glib gtk3 gobjectIntrospection python pygobject3 + gnome3.defaultIconTheme ]; src = fetchurl { diff --git a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix index 8f7c5675cc2a..8e5a1e21f52b 100644 --- a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib , clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz , webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 -, gdk_pixbuf, librsvg, hicolor_icon_theme, gtk3 }: +, gdk_pixbuf, librsvg, gtk3 }: stdenv.mkDerivation rec { name = "sushi-3.12.0"; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3 - clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg - gnome3.adwaita-icon-theme hicolor_icon_theme - libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper ]; + clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf + librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk + gnome3.evince icu makeWrapper ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix index d99a24bbfa2d..41f220ec38b8 100644 --- a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, gst_all_1 , clutter_gtk, clutter-gst, pygobject3, shared_mime_info -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , bash, makeWrapper, itstool, libxml2, dbus_glib , gnome3, librsvg, gdk_pixbuf, file }: @@ -25,8 +25,7 @@ stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gnome3.libpeas pygobject3 shared_mime_info dbus_glib - gdk_pixbuf gnome3.adwaita-icon-theme librsvg gnome3.gnome_desktop - hicolor_icon_theme gnome3.adwaita-icon-theme + gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop gnome3.gsettings_desktop_schemas makeWrapper file ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix index 4265d70a4f9f..88e6da2ad2d0 100644 --- a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, libxml2, upower -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , bash, makeWrapper, itstool, vala, sqlite, libxslt , gnome3, librsvg, gdk_pixbuf, file, libnotify , evolution_data_server, gst_all_1, poppler @@ -27,12 +27,11 @@ stdenv.mkDerivation rec { buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 bzip2 gnome3.totem-pl-parser libxslt gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.adwaita-icon-theme librsvg sqlite + gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite upower libnotify evolution_data_server gnome3.libgee gst_all_1.gstreamer gst_all_1.gst-plugins-base flac poppler icu taglib libjpeg libtiff giflib libvorbis - exempi networkmanager libpng libexif libgsf libuuid - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + exempi networkmanager libpng libexif libgsf libuuid ]; preConfigure = '' substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql" diff --git a/pkgs/desktops/gnome-3/3.16/core/vino/default.nix b/pkgs/desktops/gnome-3/3.16/core/vino/default.nix index c40820959182..dcfd7b08b08e 100644 --- a/pkgs/desktops/gnome-3/3.16/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/vino/default.nix @@ -1,6 +1,5 @@ { stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper -, hicolor_icon_theme, gnome3 -, libnotify, file, telepathy_glib, dbus_glib }: +, gnome3, libnotify, file, telepathy_glib, dbus_glib }: stdenv.mkDerivation rec { name = "vino-${versionMajor}.${versionMinor}"; @@ -15,8 +14,8 @@ stdenv.mkDerivation rec { doCheck = true; buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify - hicolor_icon_theme gnome3.adwaita-icon-theme - dbus_glib telepathy_glib file makeWrapper ]; + gnome3.defaultIconTheme dbus_glib telepathy_glib file + makeWrapper ]; preFixup = '' wrapProgram "$out/libexec/vino-server" \ diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix index 7f4057072315..e48dcafb3cf8 100644 --- a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf, sqlite +, file, librsvg, gnome3, gdk_pixbuf, sqlite , bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1 , wrapGAppsHook }: @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl - librsvg gdk_pixbuf gnome3.adwaita-icon-theme - hicolor_icon_theme gnome3.adwaita-icon-theme + librsvg gdk_pixbuf gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas wrapGAppsHook gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; diff --git a/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix index bc3521013832..d4dfb7f0a8c1 100644 --- a/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, webkitgtk, intltool, hicolor_icon_theme }: +, webkitgtk, intltool }: stdenv.mkDerivation rec { name = "devhelp-${gnome3.version}.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook webkitgtk intltool hicolor_icon_theme + pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix index 26af4d7286a3..70e7184b3387 100644 --- a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }: +, librsvg, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { name = "five-or-more-${gnome3.version}.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - hicolor_icon_theme + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix index bf15f9f2bbbe..292a54bf1938 100644 --- a/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 -, hicolor_icon_theme }: +, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }: stdenv.mkDerivation rec { name = "four-in-a-row-${gnome3.version}.2"; @@ -12,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg - libxml2 hicolor_icon_theme + libxml2 gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix index 7161eb5cdaf3..e80c6691e202 100644 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, librsvg, libxml2, hicolor_icon_theme }: +, intltool, itstool, librsvg, libxml2 }: stdenv.mkDerivation rec { name = "gnome-chess-${gnome3.version}.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 - hicolor_icon_theme + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix index 6afcc63e97f3..cab2f194d495 100644 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libxml2, intltool, itstool, hicolor_icon_theme }: +, librsvg, libxml2, intltool, itstool }: stdenv.mkDerivation rec { name = "gnome-klotski-${gnome3.version}.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 - hicolor_icon_theme + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix index 5b5bdae87c0f..73cb0cf6cebe 100644 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }: +, librsvg, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { name = "gnome-mahjongg-${gnome3.version}.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - hicolor_icon_theme + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix index e9af6c0fe4d8..92aa5bd72196 100644 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }: +, librsvg, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { name = "gnome-mines-${gnome3.version}.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - hicolor_icon_theme + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix index 8fde848fe1f7..673edff645dc 100644 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook , librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool -, libxml2, hicolor_icon_theme }: +, libxml2 }: stdenv.mkDerivation rec { name = "gnome-nibbles-${gnome3.version}.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 - librsvg libcanberra_gtk3 hicolor_icon_theme clutter_gtk + librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix index a4f945184253..306a9e40852a 100644 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 -, hicolor_icon_theme }: +, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { name = "gnome-robots-${gnome3.version}.1"; @@ -12,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3 - libxml2 hicolor_icon_theme + libxml2 gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix index 31b74cd285ea..2a2f97d1e49d 100644 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 -, hicolor_icon_theme }: +, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { name = "gnome-taquin-${gnome3.version}.1"; @@ -12,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3 - intltool itstool libxml2 hicolor_icon_theme + intltool itstool libxml2 gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix index 37654f8fa338..2b577799307c 100644 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libxml2, intltool, itstool, hicolor_icon_theme }: +, libxml2, intltool, itstool }: stdenv.mkDerivation rec { name = "gnome-tetravex-${gnome3.version}.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 hicolor_icon_theme + pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix index d409ac1b3c32..bd6be7d43c58 100644 --- a/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libxml2, intltool, itstool, hicolor_icon_theme }: +, libxml2, intltool, itstool }: stdenv.mkDerivation rec { name = "hitori-${gnome3.version}.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 - hicolor_icon_theme + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix index 1cf656fe7dcb..11655edded00 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala , makeWrapper, gdk_pixbuf, cmake, desktop_file_utils , libnotify, libcanberra, libsecret, gmime -, libpthreadstubs, hicolor_icon_theme, sqlite +, libpthreadstubs, sqlite , gnome3, librsvg, gnome_doc_utils, webkitgtk }: let @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme gnome3.gcr - gdk_pixbuf librsvg gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme ]; + libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr + gdk_pixbuf librsvg gnome3.defaultIconTheme ]; preConfigure = '' substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0' diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix index c078297c803b..6600345060f9 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, python, pygobject3, atk -, pkgconfig, gtk3, glib, hicolor_icon_theme, libsoup +, pkgconfig, gtk3, glib, libsoup , bash, makeWrapper, itstool, libxml2, python3Packages , gnome3, librsvg, gdk_pixbuf, file, libnotify }: @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme + gdk_pixbuf gnome3.defaultIconTheme librsvg python pygobject3 libnotify gnome3.gnome_shell libsoup gnome3.gnome_settings_daemon gnome3.nautilus gnome3.gnome_desktop ]; diff --git a/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix index 650d978277bd..0440af440fec 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base, - glib, gobjectIntrospection, hicolor_icon_theme, telepathy_glib + glib, gobjectIntrospection, telepathy_glib }: stdenv.mkDerivation rec { @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings_desktop_schemas gnome3.gnome_desktop - gnome3.gnome_common gnome3.gnome_shell hicolor_icon_theme gtk3 - telepathy_glib + gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib + gnome3.defaultIconTheme ]; preBuild = ''