summary refs log tree commit diff
path: root/pkgs/applications/audio/audacious
diff options
context:
space:
mode:
authorAlexey Lebedeff <alebedev@mirantis.com>2016-05-06 09:53:40 +0300
committerAlexey Lebedeff <alebedev@mirantis.com>2016-05-06 09:53:40 +0300
commita7208786394978e092d3080ad2f2486885e5eeb4 (patch)
treedeb69335bd3f34aa3d07454d1ee7353159d2f7a8 /pkgs/applications/audio/audacious
parentcb7f378e9c8bc04638fc4815c654f066fa014794 (diff)
downloadnixpkgs-a7208786394978e092d3080ad2f2486885e5eeb4.tar
nixpkgs-a7208786394978e092d3080ad2f2486885e5eeb4.tar.gz
nixpkgs-a7208786394978e092d3080ad2f2486885e5eeb4.tar.bz2
nixpkgs-a7208786394978e092d3080ad2f2486885e5eeb4.tar.lz
nixpkgs-a7208786394978e092d3080ad2f2486885e5eeb4.tar.xz
nixpkgs-a7208786394978e092d3080ad2f2486885e5eeb4.tar.zst
nixpkgs-a7208786394978e092d3080ad2f2486885e5eeb4.zip
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.
Diffstat (limited to 'pkgs/applications/audio/audacious')
-rw-r--r--pkgs/applications/audio/audacious/default.nix9
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 9476fbaf335..7c8a7e85dc2 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
       )
     '';