6 files changed, 30 insertions, 18 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
       )
     '';
diff --git a/pkgs/applications/audio/groovebasin/default.nix b/pkgs/applications/audio/groovebasin/default.nix
index 5a5f8c30da23..0bbf2baf1055 100644
--- a/pkgs/applications/audio/groovebasin/default.nix
+++ b/pkgs/applications/audio/groovebasin/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, fetchFromGitHub, makeWrapper, callPackage, libgroove, python, utillinux }:
+{ stdenv, fetchFromGitHub, makeWrapper, callPackage, libgroove, python, utillinux, nodejs }:
 
 with stdenv.lib;
 
 let
   nodePackages = callPackage (import ../../../top-level/node-packages.nix) {
+    inherit nodejs;
     neededNatives = [ libgroove python utillinux ];
     self = nodePackages;
     generated = ./package.nix;
diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix
index 08d91498cc0a..0fa9022f67bc 100644
--- a/pkgs/applications/audio/mp3splt/default.nix
+++ b/pkgs/applications/audio/mp3splt/default.nix
@@ -1,20 +1,27 @@
-{ fetchurl, stdenv, libmp3splt, pkgconfig }:
+{ stdenv, fetchurl, pkgconfig, libmp3splt }:
 
 stdenv.mkDerivation rec {
-  name = "mp3splt-2.6.1";
+  pname = "mp3splt";
+  version = "2.6.2";
+  name = "${pname}-${version}";
+
 
   src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/mp3splt/${name}.tar.gz";
-    sha256 = "783a903fafbcf47f06673136a78b78d32a8e616a6ae06b79b459a32090dd14f7";
+    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+    sha256 = "1aiv20gypb6r84qabz8gblk8vi42cg3x333vk2pi3fyqvl82phry";
   };
 
-  buildInputs = [ libmp3splt pkgconfig ];
+  configureFlags = [ "--enable-oggsplt-symlink" "--enable-flacsplt-symlink" ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libmp3splt ];
+
+  outputs = [ "out" "man" ];
 
-  meta = {
-    description = "utility to split mp3, ogg vorbis and FLAC files without decoding";
+  meta = with stdenv.lib; {
+    description = "Utility to split mp3, ogg vorbis and FLAC files without decoding";
     homepage = http://sourceforge.net/projects/mp3splt/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.bosu ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.bosu ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix
index ac42fc716424..55b9435baaa5 100644
--- a/pkgs/applications/audio/pithos/default.nix
+++ b/pkgs/applications/audio/pithos/default.nix
@@ -6,8 +6,6 @@ pythonPackages.buildPythonApplication rec {
   version = "1.1.2";
   name = "${pname}-${version}";
 
-  namePrefix = "";
-
   src = fetchFromGitHub {
     owner = pname;
     repo  = pname;
@@ -15,6 +13,9 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "0zk9clfawsnwmgjbk7y5d526ksxd1pkh09ln6sb06v4ygaiifcxp";
   };
 
+  # No tests in repo
+  doCheck = false;
+
   postPatch = ''
     substituteInPlace setup.py --replace "/usr/share" "$out/share"
   '';
diff --git a/pkgs/applications/audio/QmidiNet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index 42c98cbb1101..42c98cbb1101 100644
--- a/pkgs/applications/audio/QmidiNet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index 5bec7aa6dd04..d0d37fb15a14 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -28,11 +28,11 @@
 # handle that.
 
 stdenv.mkDerivation rec {
-  name = "qmmp-0.8.4";
+  name = "qmmp-0.9.9";
 
   src = fetchurl {
     url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "1ld69xypyak3lzwmfvzbxsyd4fl841aaq0gmkfa7jpavbdlggydf";
+    sha256 = "1wv4kbjq50xflhrl1jjf1hm3rrw599xkd72dwm4rscm0sdvzhnc1";
   };
 
   buildInputs =