summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@users.noreply.github.com>2016-05-20 15:15:55 +0200
committerJoachim Fasting <joachifm@users.noreply.github.com>2016-05-20 15:15:55 +0200
commit94ac55fc32dbe46f89575e430018daa84906a662 (patch)
treea848ce2512e6311f0ca0f94d2faae5c43a03862e /pkgs/applications
parentf9890a0781186a09d8a4a5273a7562292a8e15f1 (diff)
parenta7208786394978e092d3080ad2f2486885e5eeb4 (diff)
downloadnixlib-94ac55fc32dbe46f89575e430018daa84906a662.tar
nixlib-94ac55fc32dbe46f89575e430018daa84906a662.tar.gz
nixlib-94ac55fc32dbe46f89575e430018daa84906a662.tar.bz2
nixlib-94ac55fc32dbe46f89575e430018daa84906a662.tar.lz
nixlib-94ac55fc32dbe46f89575e430018daa84906a662.tar.xz
nixlib-94ac55fc32dbe46f89575e430018daa84906a662.tar.zst
nixlib-94ac55fc32dbe46f89575e430018daa84906a662.zip
Merge pull request #15257 from binarin/fix-audacious-icons
audacious: Add default icon theme
Diffstat (limited to 'pkgs/applications')
-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 4046d839f7d8..193b9c1e790f 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
       )
     '';