diff options
author | Luca Bruno <lethalman88@gmail.com> | 2015-05-19 14:40:04 +0200 |
---|---|---|
committer | Luca Bruno <lethalman88@gmail.com> | 2015-05-19 14:40:04 +0200 |
commit | 1b6401fd2e5de0b89dd181d0602e67036ec72c37 (patch) | |
tree | d24fa04583f9d076a4af96daf6457dbbed87532f | |
parent | 2274382be9fe6a79299e2637ec50db172619cabc (diff) | |
download | nixpkgs-1b6401fd2e5de0b89dd181d0602e67036ec72c37.tar nixpkgs-1b6401fd2e5de0b89dd181d0602e67036ec72c37.tar.gz nixpkgs-1b6401fd2e5de0b89dd181d0602e67036ec72c37.tar.bz2 nixpkgs-1b6401fd2e5de0b89dd181d0602e67036ec72c37.tar.lz nixpkgs-1b6401fd2e5de0b89dd181d0602e67036ec72c37.tar.xz nixpkgs-1b6401fd2e5de0b89dd181d0602e67036ec72c37.tar.zst nixpkgs-1b6401fd2e5de0b89dd181d0602e67036ec72c37.zip |
More usage of gnome3.defaultIconTheme
5 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 8e4c31302e2..7e392679c71 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 makeWrapper - gnome3.gnome_icon_theme ]; + gnome3.defaultIconTheme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 629126503c9..d438bb77b85 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -51,8 +51,7 @@ in stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2 libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg makeWrapper gnome_doc_utils - gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - hicolor_icon_theme ]; + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { description = "Popular photo organizer for the GNOME desktop"; diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index e4b0675aa94..bdd1a9e8e28 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { wrapProgram "$out/bin/finalterm" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index cae9fe294f3..7ce47d53d14 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool perl perlXMLParser evolution_data_server gnome_doc_utils avahi libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite - gnome3.libsoup glib gnome3.gnome_icon_theme_symbolic - hicolor_icon_theme gnome3.gnome_icon_theme boost + gnome3.libsoup glib gnome3.defaultIconTheme boost autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr nss zlib libsecret libXrandr randrproto which libxslt libtasn1 gmp nettle makeWrapper ]; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 904f6904979..26078c8e583 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { webkitgtk json_glib gobjectIntrospection gnome3.gsettings_desktop_schemas gnome3.libpeas gnome3.dconf gst-plugins-base gst-plugins-good gst-plugins-bad - gnome3.libgnome_keyring + gnome3.libgnome_keyring gnome3.defaultIconTheme libnotify makeWrapper ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" done ''; |