* Fix some more "args: with args".

svn path=/nixpkgs/trunk/; revision=22828

1 files changed, 13 insertions, 30 deletions

diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix
index 3e200a312c7..50aa92f8d29 100644
--- a/pkgs/applications/misc/audio/sox/default.nix
+++ b/pkgs/applications/misc/audio/sox/default.nix
@@ -1,15 +1,16 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
+{ composableDerivation, lib, fetchurl, alsaLib, libao, lame, libmad }:
 
-    name = "sox-14.3.0";
+let inherit (composableDerivation) edf; in
 
-    src = args.fetchurl {
-      url = mirror://sourceforge/sox/sox-14.3.0.tar.gz;
-      sha256 = "15r39dq9nlwrypm0vpxmbxyqqv0bd6284djbi1fdfrlkjhf43gws";
-    };
+composableDerivation.composableDerivation {} {
+  name = "sox-14.3.0";
 
-    flags =
+  src = fetchurl {
+    url = mirror://sourceforge/sox/sox-14.3.0.tar.gz;
+    sha256 = "15r39dq9nlwrypm0vpxmbxyqqv0bd6284djbi1fdfrlkjhf43gws";
+  };
+
+  flags =
     # are these options of interest? We'll see
     #--disable-fftw          disable usage of FFTW
     #--enable-debug          enable debugging
@@ -23,39 +24,21 @@ composableDerivation {} {
     // edf { name = "dl-mad"; enable.buildInputs = [ libmad ]; } # use shared library
     // edf { name = "mad";    enable.buildInputs =[ libmad ]; }
     ;
-    # These options should be autodetected by the configure script
-    /*
-    --without-sndfile       Don't try to use libsndfile
-    --without-ogg           Don't try to use Ogg Vorbis
-    --without-flac          Don't try to use FLAC
-    --without-ffmpeg        Don't try to use ffmpeg
-    --without-mad           Don't try to use MAD (MP3 Audio Decoder)
-    --without-lame          Don't try to use LAME (LAME Ain't an MP3 Encoder)
-    --without-amr-wb        Don't try to use amr-wb
-    --without-amr-nb        Don't try to use amr-nb
-    --without-samplerate    Don't try to use libsamplerate (aka Secret Rabbit
-                            Code)
-    --without-ladspa        Don't try to use LADSPA
-    --with-ladspa-path      Default search path for LADSPA plugins
-    */
-
 
   cfg = {
     ossSupport = false;
     sun_audioSupport = false;
-  } // lib.listToAttrs [
-      { name = "dl-lameSupport"; value = true; }
+  } // lib.listToAttrs
+    [ { name = "dl-lameSupport"; value = true; }
       { name = "dl-madSupport"; value = true; }
-  ];
+    ];
 
   configureFlags = ["-enable-dl-lame"];
 
-
   optionals = [ "libsndfile" "libogg" "flac" "ffmpeg" "libmad" "lame"
                  /* "amr-wb" "amr-nb" */
                 "libsamplerate" /* "ladspa" */ ];
 
-
   meta = {
     description = "Sample Rate Converter for audio";
     homepage = http://www.mega-nerd.com/SRC/index.html;