From cf56d20b0d4598c20800d1d2e56201de117d88fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 12 Aug 2008 15:42:21 +0000
Subject: [PATCH] Remove duplicate expression for PIL (Python Imaging Library).

svn path=/nixpkgs/trunk/; revision=12599
---
 .../python-modules/imaging/default.nix        | 41 -------------
 .../python-modules/pil/default.nix            | 61 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  4 --
 3 files changed, 37 insertions(+), 69 deletions(-)
 delete mode 100644 pkgs/development/python-modules/imaging/default.nix

diff --git a/pkgs/development/python-modules/imaging/default.nix b/pkgs/development/python-modules/imaging/default.nix
deleted file mode 100644
index e4586762527..00000000000
--- a/pkgs/development/python-modules/imaging/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ fetchurl, stdenv, python
-, libjpeg, zlib, freetype }:
-
-let version = "1.1.6";
-in
-  stdenv.mkDerivation {
-    name = "python-imaging-${version}";
-    src = fetchurl {
-      url = "http://effbot.org/downloads/Imaging-${version}.tar.gz";
-      sha256 = "141zidl3s9v4vfi3nsbg42iq1lc2a932gprqr1kij5hrnn53bmvx";
-    };
-
-    buildInputs = [ python libjpeg zlib freetype ];
-
-    doCheck = true;
-
-    configurePhase = ''
-      sed -i "setup.py" \
-          -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ;
-              s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ;
-              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;'
-    '';
-
-    buildPhase   = "python setup.py build_ext -i";
-    checkPhase   = "python selftest.py";
-    installPhase = "python setup.py install --prefix=$out";
-
-    meta = {
-      homepage = http://www.pythonware.com/products/pil/;
-      description = "The Python Imaging Library (PIL)";
-
-      longDescription = ''
-        The Python Imaging Library (PIL) adds image processing
-        capabilities to your Python interpreter.  This library
-        supports many file formats, and provides powerful image
-        processing and graphics capabilities.
-      '';
-
-      license = "http://www.pythonware.com/products/pil/license.htm";
-    };
-  }
diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix
index d5ed9aae12a..e4586762527 100644
--- a/pkgs/development/python-modules/pil/default.nix
+++ b/pkgs/development/python-modules/pil/default.nix
@@ -1,28 +1,41 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "python-imaging-1.1.6";
+{ fetchurl, stdenv, python
+, libjpeg, zlib, freetype }:
 
-  src = fetchurl {
-    url = http://effbot.org/downloads/Imaging-1.1.6.tar.gz;
-    sha256 = "141zidl3s9v4vfi3nsbg42iq1lc2a932gprqr1kij5hrnn53bmvx";
-  };
+let version = "1.1.6";
+in
+  stdenv.mkDerivation {
+    name = "python-imaging-${version}";
+    src = fetchurl {
+      url = "http://effbot.org/downloads/Imaging-${version}.tar.gz";
+      sha256 = "141zidl3s9v4vfi3nsbg42iq1lc2a932gprqr1kij5hrnn53bmvx";
+    };
 
-  buildInputs = [python zlib libtiff libjpeg freetype];
- 
-  configurePhase = "
-		sed -e 's@FREETYPE_ROOT = None@FREETYPE_ROOT = libinclude(\"${freetype}\")@' -i setup.py
-		sed -e 's@JPEG_ROOT = None@JPEG_ROOT = libinclude(\"${libjpeg}\")@' -i setup.py
-		sed -e 's@TIFF_ROOT = None@TIFF_ROOT = libinclude(\"${libtiff}\")@' -i setup.py
-		sed -e 's@ZLIB_ROOT = None@ZLIB_ROOT = libinclude(\"${zlib}\")@' -i setup.py
-	";
+    buildInputs = [ python libjpeg zlib freetype ];
 
-  buildPhase = "true";
-	
-  installPhase = "yes Y | python setup.py install --prefix=\${out}";
+    doCheck = true;
 
-  meta = {
-    description = "
-	Python Imaging library.
-";
-  };
-}
+    configurePhase = ''
+      sed -i "setup.py" \
+          -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ;
+              s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ;
+              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;'
+    '';
+
+    buildPhase   = "python setup.py build_ext -i";
+    checkPhase   = "python selftest.py";
+    installPhase = "python setup.py install --prefix=$out";
+
+    meta = {
+      homepage = http://www.pythonware.com/products/pil/;
+      description = "The Python Imaging Library (PIL)";
+
+      longDescription = ''
+        The Python Imaging Library (PIL) adds image processing
+        capabilities to your Python interpreter.  This library
+        supports many file formats, and provides powerful image
+        processing and graphics capabilities.
+      '';
+
+      license = "http://www.pythonware.com/products/pil/license.htm";
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e481faf8c6c..3ccc88cd592 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4513,10 +4513,6 @@ let pkgs = rec {
     inherit (gtkLibs) glib gtk;
   };
 
-  pyimaging = import ../development/python-modules/imaging {
-    inherit fetchurl stdenv python libjpeg zlib freetype;
-  };
-
   pyopengl = import ../development/python-modules/pyopengl {
     inherit fetchurl stdenv setuptools mesa freeglut pil;
     python = python25;