From a7208786394978e092d3080ad2f2486885e5eeb4 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <alebedev@mirantis.com>
Date: Fri, 6 May 2016 09:53:40 +0300
Subject: [PATCH] audacious: Add default icon theme
Without this audacious shows the same empty icon for every toolbar
button. Installing icon theme to a user profile helps, but this patch
provides the default value. '--suffix' for makeWrapper is use
intentionally - just to be sure that this is only default value, and
anything else can override it.
---
pkgs/applications/audio/audacious/default.nix | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 9476fbaf3359..7c8a7e85dc29 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs
, gettext, dbus_glib, libxml2, libmad, xorg, alsaLib, libogg
, libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper
-, mpg123, neon, faad2
+, mpg123, neon, faad2, gnome3
}:
let version = "3.5.2"; in
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
buildInputs =
[ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib
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
@@ -48,8 +48,11 @@ stdenv.mkDerivation {
(
source $stdenv/setup
# gsettings schemas for file dialogues
+ # XDG_ICON_DIRS is set by hook for gnome3.defaultIconTheme
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
)
'';