diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-16 09:30:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-16 09:30:11 +0200 |
| commit | a82ea67994241870f1a53f91652b48d5e34a505f (patch) | |
| tree | 181024103470b192a74cfc50cc0fd3d16d604fed /pkgs/applications | |
| parent | d80fb9a99ee3f6e68929ea858fdc411fe3f59551 (diff) | |
| parent | 06e0a518d160d4fa21a64a7f5ac1737378aed6d7 (diff) | |
| download | nixlib-a82ea67994241870f1a53f91652b48d5e34a505f.tar nixlib-a82ea67994241870f1a53f91652b48d5e34a505f.tar.gz nixlib-a82ea67994241870f1a53f91652b48d5e34a505f.tar.bz2 nixlib-a82ea67994241870f1a53f91652b48d5e34a505f.tar.lz nixlib-a82ea67994241870f1a53f91652b48d5e34a505f.tar.xz nixlib-a82ea67994241870f1a53f91652b48d5e34a505f.tar.zst nixlib-a82ea67994241870f1a53f91652b48d5e34a505f.zip | |
Merge pull request #43633 from jfrankenau/fix-icon-cache
pulseeffects, lightdm-gtk-greeter, gxmessage, viking: depend on hicolor-icon-theme
Diffstat (limited to 'pkgs/applications')
4 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index f4b799f55207..285c809b12a3 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -29,6 +29,7 @@ , zam-plugins , rubberband , mda_lv2 +, hicolor-icon-theme }: let @@ -79,6 +80,7 @@ in stdenv.mkDerivation rec { boost fftwFloat zita-convolver + hicolor-icon-theme ]; postPatch = '' diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 3227151ce21e..7ae854cee3cc 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lightdm exo intltool makeWrapper ] + buildInputs = [ lightdm exo intltool makeWrapper hicolor-icon-theme ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); configureFlags = [ diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index a61d532f1f8e..8401386ead49 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo}: +{ stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "gxmessage-${version}"; @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gnome3.gtk texinfo ]; + buildInputs = [ intltool gnome3.gtk texinfo hicolor-icon-theme ]; + meta = { description = "A GTK enabled dropin replacement for xmessage"; homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index d090878f9768..b7d0b330e85b 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl , gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper -, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }: +, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "viking-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils - libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite + libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite hicolor-icon-theme ]; configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ]; |