diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index f45392c8ee35..91d27254aede 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -1,23 +1,25 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "aubio-";
+{ stdenv, fetchurl, pkgconfig, fftw, libsndfile, libsamplerate
+, python, alsaLib, jackaudio }:
+
+stdenv.mkDerivation rec {
+  name = "aubio-0.3.2";
 
   src = fetchurl {
-    url = http://aubio.org/pub/aubio-0.3.2.tar.gz;
+    url = "http://aubio.org/pub/${name}.tar.gz";
     sha256 = "1k8j2m8wdpa54hvrqy6nqfcx42x6nwa77hi3ym0n22k192q8f4yw";
   };
 
-  buildInputs = [
-    pkgconfig fftw libsndfile libsamplerate python
-    # optional:
-    alsaLib jackaudio
+  buildInputs =
+    [ pkgconfig fftw libsndfile libsamplerate python
+      # optional:
+      alsaLib jackaudio
     ];
 
   meta = { 
-    description = "ibrary for audio labelling";
+    description = "A library for audio labelling";
     homepage = http://aubio.org/;
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33803dc71f2c..7990ac0d3c63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3011,7 +3011,7 @@ let
     });
 
   aubio = import ../development/libraries/aubio {
-    inherit fetchurl stdenv lib pkgconfig fftw libsndfile libsamplerate python
+    inherit fetchurl stdenv pkgconfig fftw libsndfile libsamplerate python
       alsaLib jackaudio;
   };
 
@@ -6341,8 +6341,7 @@ let
       libsndfile libsigcxx libusb cairomm librdf liblo fftw fftwSinglePrec
       aubio libmad;
     inherit (gtkLibs) glib pango gtk glibmm gtkmm;
-
-    inherit (gnome) libgnomecanvas ;
+    inherit (gnome) libgnomecanvas;
   };
 
   audacious = import ../applications/audio/audacious/player.nix {