* libjpeg updated to version 8.

* libpng updated to 1.4.0.
* For libjpegStatic, use a stdenv adapter to build a static library.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19605

4 files changed, 22 insertions, 11 deletions

diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index 6e4ad9a0971..bc3245cf76d 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -1,15 +1,13 @@
-{ stdenv, fetchurl, libtool, static ? false }: 
+{ stdenv, fetchurl }: 
 
 stdenv.mkDerivation {
-  name = "libjpeg-7";
+  name = "libjpeg-8";
   
   src = fetchurl {
-    url = http://www.ijg.org/files/jpegsrc.v7.tar.gz;
-    sha256 = "1gvy6f83pskxrxwnxqah3g9mhnlgi6aph39b99609gn50ri8ddsh";
+    url = http://www.ijg.org/files/jpegsrc.v8.tar.gz;
+    sha256 = "1b0blpk8v397klssk99l6ddsb64krcb29pbkbp8ziw5kmjvsbfhp";
   };
   
-  configureFlags = "--enable-shared ${if static then " --enable-static" else ""}";
-
   meta = {
     homepage = http://www.ijg.org/;
     description = "A library that implements the JPEG image file format";
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 87148e76059..39b47c00a95 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,11 +3,11 @@
 assert zlib != null;
 
 stdenv.mkDerivation rec {
-  name = "libpng-1.2.40";
+  name = "libpng-1.4.0";
   
   src = fetchurl {
     url = "mirror://sourceforge/libpng/${name}.tar.gz";
-    md5 = "a2f6808735bf404967f81519a967fb2a";
+    md5 = "dfa01122db3be9808a8c9ace7d0580fd";
   };
   
   propagatedBuildInputs = [zlib];
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 5b37f9908c2..ac9e807801c 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -107,6 +107,19 @@ rec {
       isStatic = true;
     } // {inherit fetchurl;};
 
+    
+  # Return a modified stdenv that disables building shared libraries.
+  # However, executables will still be dynamically linked.
+  disableSharedLibraries = stdenv: stdenv //
+    { mkDerivation = args: stdenv.mkDerivation (args // {
+        dontDisableStatic = true;
+        configureFlags =
+          (if args ? configureFlags then args.configureFlags else "")
+          + " --disable-shared"; # brrr...
+      });
+    } // {inherit fetchurl;};
+
+    
   # Return a modified stdenv that adds a cross compiler to the
   # builds.
   makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv //
@@ -164,6 +177,7 @@ rec {
         };
     } // { inherit cross; };
 
+    
   /* Modify a stdenv so that the specified attributes are added to
      every derivation returned by its mkDerivation function.
 
@@ -267,7 +281,6 @@ rec {
 
   /* Use the trace output to report all processed derivations with their
      license name.
- 
   */
   traceDrvLicenses = stdenv: stdenv //
     { mkDerivation = args:
@@ -289,6 +302,7 @@ rec {
         };
     };
 
+    
   /* Abort if the license predicate is not verified for a derivation
      declared with mkDerivation.
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b85bd77ce7a..6d2ec6406a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4172,7 +4172,6 @@ let
 
   libjpeg = makeOverridable (import ../development/libraries/libjpeg) {
     inherit fetchurl stdenv;
-    libtool = libtool_1_5;
   };
 
   libjpeg62 = makeOverridable (import ../development/libraries/libjpeg/62.nix) {
@@ -4181,7 +4180,7 @@ let
   };
 
   libjpegStatic = lowPrio (appendToName "static" (libjpeg.override {
-    static = true;
+    stdenv = disableSharedLibraries stdenv;
   }));
 
   libksba = import ../development/libraries/libksba {