From f210a41f844b7442f69300b9980db141e1cf5190 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 29 Oct 2009 14:13:07 +0000
Subject: [PATCH] * Shocking: a new version of libjpeg!

svn path=/nixpkgs/branches/xorg-7.5/; revision=18024
---
 pkgs/development/libraries/libjpeg/builder.sh | 25 ---------------
 .../development/libraries/libjpeg/default.nix | 31 ++++++-------------
 2 files changed, 10 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/development/libraries/libjpeg/builder.sh

diff --git a/pkgs/development/libraries/libjpeg/builder.sh b/pkgs/development/libraries/libjpeg/builder.sh
deleted file mode 100644
index 923f4f839744..000000000000
--- a/pkgs/development/libraries/libjpeg/builder.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-source $stdenv/setup
-
-preConfigure() {
-    # Workarounds for the ancient libtool shipped by libjpeg.
-    ln -s $libtool/bin/libtool .
-    cp $libtool/share/libtool/config.guess .
-    cp $libtool/share/libtool/config.sub .
-}
-
-preInstall() {
-    mkdir $out
-    mkdir $out/bin
-    mkdir $out/lib
-    mkdir $out/include
-    mkdir $out/man
-    mkdir $out/man/man1
-}
-
-patchPhase() {
-    for i in $patches; do
-	patch < $i
-    done
-}
-
-genericBuild
\ No newline at end of file
diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index fb92fe995b66..6e4ad9a0971b 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -1,29 +1,18 @@
-{stdenv, fetchurl, libtool, static ? false, ...}: 
+{ stdenv, fetchurl, libtool, static ? false }: 
 
 stdenv.mkDerivation {
-  name = "libjpeg-6b";
-  
-  builder = ./builder.sh;
+  name = "libjpeg-7";
   
   src = fetchurl {
-    url = http://www.ijg.org/files/jpegsrc.v6b.tar.gz;
-    md5 = "dbd5f3b47ed13132f04c685d608a7547";
+    url = http://www.ijg.org/files/jpegsrc.v7.tar.gz;
+    sha256 = "1gvy6f83pskxrxwnxqah3g9mhnlgi6aph39b99609gn50ri8ddsh";
   };
   
-  inherit libtool;
-
   configureFlags = "--enable-shared ${if static then " --enable-static" else ""}";
-    
-  # Required for building of dynamic libraries on Darwin.
-  patches = [
-    (fetchurl {
-      url = http://svn.macports.org/repository/macports/trunk/dports/graphics/jpeg/files/patch-ltconfig;
-      md5 = "e6725fa4a09aa1de4ca75343fd0f61d5";
-    })
-    (fetchurl {
-      url = http://svn.macports.org/repository/macports/trunk/dports/graphics/jpeg/files/patch-ltmain.sh;
-      #md5 = "489986ad8e7a93aef036766b25f321d5";
-      md5 = "092a12aeb0c386dd7dae059109d950ba";
-    })
-  ];
+
+  meta = {
+    homepage = http://www.ijg.org/;
+    description = "A library that implements the JPEG image file format";
+    license = "free";
+  };
 }