From 40503a2eab2d503e572f9b53dcb6052d61055031 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 Sep 2015 10:03:59 +0200 Subject: [PATCH] redshift: add hicolor_icon_theme dependency This fixes the icon-theme.cache collision by removing it during Fixup. --- pkgs/applications/misc/redshift/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 5f4120dae491..6e5404eb6861 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig , geoclue -, guiSupport ? true, gtk3, python, pygobject3, pyxdg +, guiSupport ? true, hicolor_icon_theme, gtk3, python, pygobject3, pyxdg , drmSupport ? true, libdrm , randrSupport ? true, libxcb , vidModeSupport ? true, libX11, libXxf86vm @@ -18,7 +18,7 @@ stdenv.mkDerivation { }; buildInputs = [ geoclue ] - ++ stdenv.lib.optionals guiSupport [ gtk3 python pygobject3 pyxdg ] + ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme gtk3 python pygobject3 pyxdg ] ++ stdenv.lib.optionals drmSupport [ libdrm ] ++ stdenv.lib.optionals randrSupport [ libxcb ] ++ stdenv.lib.optionals vidModeSupport [ libX11 libXxf86vm ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation { wrapProgram "$out/bin/redshift-gtk" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share" + --prefix XDG_DATA_DIRS : "$out/share:${hicolor_icon_theme}/share" ''; meta = with stdenv.lib; {