* Get rid of many instances of "args: with args;", and other coding

  guidelines violations.
* Updated libsamplerate to 0.1.7.

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

1 files changed, 11 insertions, 11 deletions

diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index a30a2884c6a3..911145c5b748 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -1,23 +1,23 @@
-args: with args;
-stdenv.mkDerivation {
+{ stdenv, fetchurl }:
 
-  name = "libsamplerate-0.1.2";
+stdenv.mkDerivation rec {
+  name = "libsamplerate-0.1.7";
 
-  src = args.fetchurl {
-    url = http://www.mega-nerd.com/SRC/libsamplerate-0.1.2.tar.gz;
+  src = fetchurl {
+    url = "http://www.mega-nerd.com/SRC/${name}.tar.gz";
     sha256 = "1m1iwzpcny42kcqv5as2nyb0ggrb56wzckpximqpp2y74dipdf4q";
   };
 
-
-  buildInputs = ["pkgconfig"];
   # maybe interesting configure flags:
   #--disable-fftw          disable usage of FFTW
   #--disable-cpu-clip      disable tricky cpu specific clipper
 
-  configurePhase = "
-   export LIBSAMPLERATE_CFLAGS=\"-I \$libsamplerate/include\"
-   export LIBSAMPLERATE_LIBS=\"-L \$libsamplerate/libs\"
-   ./configure --prefix=\$out";
+  configurePhase =
+    ''
+      export LIBSAMPLERATE_CFLAGS="-I $libsamplerate/include"
+      export LIBSAMPLERATE_LIBS="-L $libsamplerate/libs"
+      ./configure --prefix=$out
+    '';
 
   meta = {
     description = "Sample Rate Converter for audio";