Skip to content

Commit

Permalink
More usage of gnome3.defaultIconTheme
Browse files Browse the repository at this point in the history
  • Loading branch information
lucabrunox committed May 19, 2015
1 parent 2274382 commit 1b6401f
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion pkgs/applications/audio/pavucontrol/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
'';

buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 makeWrapper
gnome3.gnome_icon_theme ];
gnome3.defaultIconTheme ];

nativeBuildInputs = [ pkgconfig intltool ];

Expand Down
3 changes: 1 addition & 2 deletions pkgs/applications/graphics/shotwell/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/finalterm/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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; {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/networking/newsreaders/liferea/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
];
Expand All @@ -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
'';

Expand Down

0 comments on commit 1b6401f

Please sign in to comment.