Merge pull request #15257 from binarin/fix-audacious-icons

audacious: Add default icon theme
This commit is contained in:
Joachim Fasting 2016-05-20 15:15:55 +02:00
commit 94ac55fc32

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs { stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs
, gettext, dbus_glib, libxml2, libmad, xorg, alsaLib, libogg , gettext, dbus_glib, libxml2, libmad, xorg, alsaLib, libogg
, libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper , libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper
, mpg123, neon, faad2 , mpg123, neon, faad2, gnome3
}: }:
let version = "3.5.2"; in let version = "3.5.2"; in
@ -22,7 +22,7 @@ stdenv.mkDerivation {
buildInputs = buildInputs =
[ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib [ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib
libmad xorg.libXcomposite libogg libvorbis flac alsaLib libcdio libmad xorg.libXcomposite libogg libvorbis flac alsaLib libcdio
libcddb ffmpeg makeWrapper mpg123 neon faad2 libcddb ffmpeg makeWrapper mpg123 neon faad2 gnome3.defaultIconTheme
]; ];
# Here we build bouth audacious and audacious-plugins in one # Here we build bouth audacious and audacious-plugins in one
@ -48,8 +48,11 @@ stdenv.mkDerivation {
( (
source $stdenv/setup source $stdenv/setup
# gsettings schemas for file dialogues # gsettings schemas for file dialogues
# XDG_ICON_DIRS is set by hook for gnome3.defaultIconTheme
for file in "$out/bin/"*; do for file in "$out/bin/"*; do
wrapProgram "$file" --prefix XDG_DATA_DIRS : "$XDG_ADD:$GSETTINGS_SCHEMAS_PATH" wrapProgram "$file" \
--prefix XDG_DATA_DIRS : "$XDG_ADD:$GSETTINGS_SCHEMAS_PATH" \
--suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
done done
) )
''; '';