From 87a62e5409d08e07cafd474d94682706aaa520da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 22 Nov 2009 19:11:27 +0000
Subject: [PATCH] gutenprint: Fix name, improve style.

svn path=/nixpkgs/trunk/; revision=18532
---
 pkgs/misc/drivers/gutenprint/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix
index 54a61749f9a..832aeb9793c 100644
--- a/pkgs/misc/drivers/gutenprint/default.nix
+++ b/pkgs/misc/drivers/gutenprint/default.nix
@@ -1,13 +1,16 @@
 # this package was called gimp-print in the past
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf wwf; in
+{ fetchurl, stdenv, lib, pkgconfig, composableDerivation, cups
+, libtiff, libpng, openssl, git, gimp }@args :
+
+let
+   version = "5.2.4";
+   inherit (args.composableDerivation) composableDerivation edf wwf;
+in
 composableDerivation {} {
-
-
-  name = "gutenprint-drivers";
+  name = "gutenprint-${version}";
 
   src = fetchurl {
-    url = mirror://sourceforge/gimp-print/files/gutenprint-5.2/5.2.4/gutenprint-5.2.4.tar.bz2;
+    url = "mirror://sourceforge/gimp-print/files/gutenprint-5.2/${version}/gutenprint-${version}.tar.bz2";
     sha256 = "09lnmf92h51sm0hmzd1hn2kl1sh6dxlnc0zjd9lrifzg0miyh45n";
   };