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

redshift: fix broken icons

Browse Source 
Redshift uses SVG icons and librsvg therefore needs to be available and
the `GDK_PIXBUF_MODULE_FILE` variable set in the wrapper.
This commit is contained in:
Robert Helgesson 2016-10-01 23:00:18 +02:00
parent 5bf5de58ea
commit 14340ac21f
No known key found for this signature in database
GPG Key ID: C3DB11069E65DC86
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig { fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig
, geoclue2 , geoclue2
, guiSupport ? true, hicolor_icon_theme, gtk3, python, pygobject3, pyxdg , guiSupport ? true, hicolor_icon_theme, librsvg, gtk3, python, pygobject3, pyxdg
, drmSupport ? true, libdrm , drmSupport ? true, libdrm
, randrSupport ? true, libxcb , randrSupport ? true, libxcb
, vidModeSupport ? true, libX11, libXxf86vm , vidModeSupport ? true, libX11, libXxf86vm
@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ geoclue2 ] buildInputs = [ geoclue2 ]
++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme gtk3 python ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme librsvg gtk3
pygobject3 pyxdg ] 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 ];
@ -41,9 +41,9 @@ stdenv.mkDerivation rec {
substituteInPlace src/redshift-gtk/redshift-gtk \ substituteInPlace src/redshift-gtk/redshift-gtk \
--replace "/usr/bin/env python3" "${python}/bin/${python.executable}" --replace "/usr/bin/env python3" "${python}/bin/${python.executable}"
''; '';
postInstall = stdenv.lib.optionalString guiSupport '' postInstall = stdenv.lib.optionalString guiSupport ''
wrapProgram "$out/bin/redshift-gtk" \ wrapProgram "$out/bin/redshift-gtk" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--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:${hicolor_icon_theme}/share" --prefix XDG_DATA_DIRS : "$out/share:${hicolor_icon_theme}/share"