* 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

pkgs/os-specific/linux/radeontools/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pciutils }:
+
 stdenv.mkDerivation {
   name = "radeontool-1.5";
 
@@ -6,26 +7,26 @@ stdenv.mkDerivation {
 
   # Don't know wether it's a good idea to hardcode the lspci path..
   # But it will work on nix..
-  postUnpack = "
-    cd $sourceRoot;
-    sed -i \"s%lspci%\$pciutils/sbin/lspci%g\" radeontool.c
+  postUnpack = ''
+    cd $sourceRoot
+    sed -i "s%lspci%$pciutils/sbin/lspci%g" radeontool.c
     cd ..
-  ";
+  '';
 
   src = fetchurl {
     url = http://fdd.com/software/radeon/radeontool-1.5.tar.gz;
     sha256 = "0qbkawhhq0y0gqbbql7q04y0v0hims5c4jkjsbc1y03rf9kr10ar";
   };
 
-  installPhase = "
-    ensureDir \$out/bin
+  installPhase = ''
+    ensureDir $out/bin
     chmod +x lightwatch.pl
-    cp radeontool lightwatch.pl \$out/bin
-  ";
+    cp radeontool lightwatch.pl $out/bin
+  '';
 
   meta = { 
-      description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards";
-      homepage = http://fdd.com/software/radeon/;
-      license = "ZLIB";
-    };
+    description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards";
+    homepage = http://fdd.com/software/radeon/;
+    license = "ZLIB";
+  };
 }