From 66097104090e06c43a784193809bc8843a2ec052 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 28 Jul 2010 11:55:54 +0000 Subject: * 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/misc/drivers/gutenprint/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'pkgs/misc/drivers/gutenprint/default.nix') 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 = -- cgit 1.4.1