public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

redshift: add hicolor_icon_theme dependency

Browse Source 
This fixes the icon-theme.cache collision by removing it during Fixup.
This commit is contained in:
Tobias Geerinckx-Rice 2015-09-30 10:03:59 +02:00
parent 5ed03241be
commit 40503a2eab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/redshift/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig { fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig
, geoclue , geoclue
, guiSupport ? true, gtk3, python, pygobject3, pyxdg , guiSupport ? true, hicolor_icon_theme, gtk3, python, pygobject3, pyxdg
, drmSupport ? true, libdrm , drmSupport ? true, libdrm
, randrSupport ? true, libxcb , randrSupport ? true, libxcb
, vidModeSupport ? true, libX11, libXxf86vm , vidModeSupport ? true, libX11, libXxf86vm
@ -18,7 +18,7 @@ stdenv.mkDerivation {
}; };
buildInputs = [ geoclue ] 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 drmSupport [ libdrm ]
++ stdenv.lib.optionals randrSupport [ libxcb ] ++ stdenv.lib.optionals randrSupport [ libxcb ]
++ stdenv.lib.optionals vidModeSupport [ libX11 libXxf86vm ]; ++ stdenv.lib.optionals vidModeSupport [ libX11 libXxf86vm ];
@ -40,7 +40,7 @@ stdenv.mkDerivation {
wrapProgram "$out/bin/redshift-gtk" \ wrapProgram "$out/bin/redshift-gtk" \
--prefix PYTHONPATH : "$PYTHONPATH" \ --prefix PYTHONPATH : "$PYTHONPATH" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --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; { meta = with stdenv.lib; {