From 3d7916824ea78eda67604d36fb7599ecb7c6b9f5 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Mon, 16 Jul 2018 20:50:04 +0200
Subject: [PATCH 1/4] pulseeffects: depend on hicolor-icon-theme

This avoids conflicts on `share/icons/hicolor/icon-theme.cache`.
---
 pkgs/applications/audio/pulseeffects/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
index 6a1237dd9b3..c9d4e5ccc5f 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -27,6 +27,7 @@
 , zam-plugins
 , rubberband
 , mda_lv2
+, hicolor-icon-theme
 }:
 
 let
@@ -75,6 +76,7 @@ in stdenv.mkDerivation rec {
     boost
     fftwFloat
     zita-convolver
+    hicolor-icon-theme
   ];
 
   postPatch = ''

From 10707eaf438daac876e8c481e658739c7f4517dc Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Mon, 16 Jul 2018 20:50:30 +0200
Subject: [PATCH 2/4] lightdm-gtk-greeter: depend on hicolor-icon-theme

This avoids conflicts on `share/icons/hicolor/icon-theme.cache`.
---
 pkgs/applications/display-managers/lightdm/gtk-greeter.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
index 3227151ce21..7ae854cee3c 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 = [

From e0936ff6e36a3508fe197161596580770dfcedd5 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Mon, 16 Jul 2018 20:50:53 +0200
Subject: [PATCH 3/4] gxmessage: depend on hicolor-icon-theme

This avoids conflicts on `share/icons/hicolor/icon-theme.cache`.
---
 pkgs/applications/misc/gxmessage/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix
index a61d532f1f8..8401386ead4 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";

From 06e0a518d160d4fa21a64a7f5ac1737378aed6d7 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Mon, 16 Jul 2018 20:51:05 +0200
Subject: [PATCH 4/4] viking: depend on hicolor-icon-theme

This avoids conflicts on `share/icons/hicolor/icon-theme.cache`.
---
 pkgs/applications/misc/viking/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix
index d090878f976..b7d0b330e85 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" ];