From de58e076cb20cbf5dce24e5e8b96079558a3e313 Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Sat, 23 Jul 2005 20:55:52 +0000
Subject: [PATCH] Use the autoconf distribution of libpng

svn path=/nixpkgs/trunk/; revision=3414
---
 pkgs/development/libraries/libpng/builder.sh  | 15 ---------------
 pkgs/development/libraries/libpng/default.nix |  5 ++---
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/libraries/libpng/builder.sh

diff --git a/pkgs/development/libraries/libpng/builder.sh b/pkgs/development/libraries/libpng/builder.sh
deleted file mode 100644
index 2aace3d271b5..000000000000
--- a/pkgs/development/libraries/libpng/builder.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-. $stdenv/setup
-
-makeFlags="-f scripts/makefile.linux"
-
-preInstall() {
-    mkdir $out
-    mkdir $out/bin
-    mkdir $out/lib
-    mkdir $out/include
-}
-preInstall=preInstall
-
-installFlags="-f scripts/makefile.linux install prefix=$out"
-
-genericBuild
\ No newline at end of file
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 611064b385e4..d9f2c37a9b31 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -4,10 +4,9 @@ assert zlib != null;
 
 stdenv.mkDerivation {
   name = "libpng-1.2.8";
-  builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libpng-1.2.8.tar.bz2;
-    md5 = "00cea4539bea4bd34cbf8b82ff9589cd";
+    url = http://surfnet.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.8-config.tar.gz;
+    md5 = "e5a39003eed16103cbbd3b6a8bc6b1f9";
   };
   propagatedBuildInputs = [zlib];
   inherit zlib;