From 9adde87feae51574d0317cb6a9e0e60a40388466 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 19 May 2015 14:44:27 +0200 Subject: More usage of gnome3.defaultIconTheme --- pkgs/applications/video/pitivi/default.nix | 2 +- pkgs/development/tools/misc/d-feet/default.nix | 2 +- pkgs/misc/emulators/cdemu/analyzer.nix | 3 ++- pkgs/misc/emulators/cdemu/gui.nix | 3 ++- pkgs/tools/audio/gvolicon/default.nix | 4 ++-- pkgs/tools/audio/pasystray/default.nix | 9 ++++++--- pkgs/tools/networking/gupnp-tools/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 4 +--- 8 files changed, 19 insertions(+), 15 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 5b77ec916b08..743df2647f1a 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { buildInputs = [ gobjectIntrospection clutter-gst clutter-gtk librsvg gnome3.gnome_desktop - hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas libnotify ] ++ (with gst; [ gstreamer gst-python gst-editing-services diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 5afe5525d0e2..df26db519dcd 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 itstool intltool glib gtk3 pep8 python - gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.defaultIconTheme makeWrapper pygobject3 libwnck3 ]; diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index 6126108b642d..c9651fd06145 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -5,7 +5,8 @@ let pkg = import ./base.nix { pkgSha256 = "1rb3f7c08dxc02zrwrkfvq7qlzlmm0kd2ah1fhxj6ajiyshi8q4v"; }; in callPackage pkg { - buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme gdk_pixbuf librsvg ]; + buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper + gnome3.defaultIconTheme gdk_pixbuf librsvg ]; drvParams = { postFixup = '' wrapProgram $out/bin/image-analyzer \ diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index b3d7f6d23ec7..226031a2eb75 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -5,7 +5,8 @@ let pkg = import ./base.nix { pkgSha256 = "1m5ab325r586v2y2d93a817phn6wck67y5mfkf948mph40ks0mqk"; }; in callPackage pkg { - buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme gdk_pixbuf librsvg ]; + buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper + gnome3.defaultIconTheme gdk_pixbuf librsvg ]; drvParams = { postFixup = '' wrapProgram $out/bin/gcdemu \ diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 6bcddfa72f1b..d885a6ac902e 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, hicolor_icon_theme, gdk_pixbuf, librsvg }: +{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg }: stdenv.mkDerivation { name = "gvolicon"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [ pkgconfig makeWrapper alsaLib gnome3.gtk ]; - propagatedBuildInputs = [ gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic hicolor_icon_theme gdk_pixbuf librsvg ]; + propagatedBuildInputs = [ gnome3.defaultIconTheme gdk_pixbuf librsvg ]; installPhase = '' make install PREFIX=$out wrapProgram "$out/bin/gvolicon" \ diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 42a2c9c3a12c..0a378dbe36b8 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, unzip, autoconf, automake, makeWrapper, pkgconfig, gnome_icon_theme, avahi, gtk3, libnotify, pulseaudio, x11}: +{stdenv, fetchurl, unzip, autoconf, automake, makeWrapper, pkgconfig +, avahi, gtk3, libnotify, pulseaudio, x11}: stdenv.mkDerivation rec { name = "pasystray-0.4.0"; @@ -8,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1gpb7yqcxqglv50iqbkg2lg3r0z07jm4ir2zqmvns6sgddks590w"; }; - buildInputs = [ unzip autoconf automake makeWrapper pkgconfig gnome_icon_theme avahi gtk3 libnotify pulseaudio x11 ]; + buildInputs = [ unzip autoconf automake makeWrapper pkgconfig + gnome3.defaultIconTheme + avahi gtk3 libnotify pulseaudio x11 ]; preConfigure = '' aclocal @@ -19,7 +22,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/pasystray" \ - --prefix XDG_DATA_DIRS : "${gnome_icon_theme}/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 54f3e860e0c7..d0f2ef546691 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij"; }; - buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av gnome3.gnome_icon_theme gnome3.gnome_themes_standard makeWrapper]; + buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av + gnome3.defaultIconTheme gnome3.gnome_themes_standard makeWrapper]; postInstall = '' - wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share" - wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share" + wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share" + wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share" ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60b175e93fc8..10143e76d5d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2208,9 +2208,7 @@ let pa_applet = callPackage ../tools/audio/pa-applet { }; - pasystray = callPackage ../tools/audio/pasystray { - inherit (gnome3) gnome_icon_theme; - }; + pasystray = callPackage ../tools/audio/pasystray { }; pnmixer = callPackage ../tools/audio/pnmixer { }; -- cgit 1.4.1