* 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

2 files changed, 12 insertions, 8 deletions

diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix
index aef8c239caf0..feb42296c9d8 100644
--- a/pkgs/misc/drivers/gutenprint/bin.nix
+++ b/pkgs/misc/drivers/gutenprint/bin.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, rpm, cpio, zlib }:
 
 assert stdenv.system == "x86_64-linux";
 
@@ -25,6 +25,7 @@ then. I've tried that.
 TODO tidy this all up. Find source instead of binary. Fix paths ... Find out how to check ink levels etc
  
 */
+
 stdenv.mkDerivation {
   name = "cups-gutenprint-binary-5.0.1";
 
@@ -58,6 +59,6 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "some additional drivers including canon printer drivers";
+    description = "Some additional CUPS drivers including Canon drivers";
   };
 }
diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix
index 832aeb9793c0..f1a01eefba59 100644
--- a/pkgs/misc/drivers/gutenprint/default.nix
+++ b/pkgs/misc/drivers/gutenprint/default.nix
@@ -1,12 +1,13 @@
 # this package was called gimp-print in the past
-{ fetchurl, stdenv, lib, pkgconfig, composableDerivation, cups
-, libtiff, libpng, openssl, git, gimp }@args :
+{ fetchurl, stdenv, pkgconfig, composableDerivation, cups
+, libtiff, libpng, openssl, gimp }:
 
 let
    version = "5.2.4";
-   inherit (args.composableDerivation) composableDerivation edf wwf;
+   inherit (composableDerivation) edf wwf;
 in
-composableDerivation {} {
+
+composableDerivation.composableDerivation {} {
   name = "gutenprint-${version}";
 
   src = fetchurl {
@@ -15,12 +16,14 @@ composableDerivation {} {
   };
 
   # gimp, gui is still not working (TODO)
-  buildInputs = [ openssl  pkgconfig];
+  buildInputs = [ openssl pkgconfig ];
 
   configureFlags = ["--enable-static-genppd"];
+  
   #preConfigure = ''
   #  configureFlags="--with-cups=$out/usr-cups $configureFlags"
   #'';
+  
   /*
      is this recommended? without it this warning is printed:
 
@@ -41,7 +44,7 @@ composableDerivation {} {
     license = "GPL";
   };
 
-  mergeAttrBy = { installArgs = lib.concat; };
+  mergeAttrBy = { installArgs = stdenv.lib.concat; };
 
   # most interpreters aren't tested yet.. (see python for example how to do it)
   flags =