* Merge libjpeg and libjpeg-static.

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

5 files changed, 8 insertions, 62 deletions

diff --git a/pkgs/development/libraries/libjpeg-static/builder.sh b/pkgs/development/libraries/libjpeg-static/builder.sh
deleted file mode 100644
index b5662f7eb67..00000000000
--- a/pkgs/development/libraries/libjpeg-static/builder.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-source $stdenv/setup
-
-preConfigure=preConfigure
-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=preInstall
-preInstall() {
-    mkdir $out
-    mkdir $out/bin
-    mkdir $out/lib
-    mkdir $out/include
-    mkdir $out/man
-    mkdir $out/man/man1
-}
-
-patchPhase=patchPhase
-patchPhase() {
-    for i in $patches; do
-	patch < $i
-    done
-}
-
-genericBuild
\ No newline at end of file
diff --git a/pkgs/development/libraries/libjpeg-static/default.nix b/pkgs/development/libraries/libjpeg-static/default.nix
deleted file mode 100644
index e0722eba415..00000000000
--- a/pkgs/development/libraries/libjpeg-static/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{stdenv, fetchurl, libtool, static ? false}: 
-
-stdenv.mkDerivation {
-  name = "libjpeg-6b";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nixos.org/tarballs/jpegsrc.v6b.tar.gz;
-    md5 = "dbd5f3b47ed13132f04c685d608a7547";
-  };
-  inherit libtool;
-
-  configureFlags = "--enable-shared" +
-    (if static then " --enable-static" else "");
-
-  # Required for building of dynamic libraries on Darwin.
-  patches = [
-    (fetchurl {
-      url = http://nixos.org/tarballs/patch-ltconfig;
-      md5 = "e6725fa4a09aa1de4ca75343fd0f61d5";
-    })
-    (fetchurl {
-      url = http://nixos.org/tarballs/patch-ltmain.sh;
-      #md5 = "489986ad8e7a93aef036766b25f321d5";
-      md5 = "092a12aeb0c386dd7dae059109d950ba";
-    })
-  ];
-}
diff --git a/pkgs/development/libraries/libjpeg/builder.sh b/pkgs/development/libraries/libjpeg/builder.sh
index 1b006f4e0c0..b5662f7eb67 100644
--- a/pkgs/development/libraries/libjpeg/builder.sh
+++ b/pkgs/development/libraries/libjpeg/builder.sh
@@ -1,7 +1,5 @@
 source $stdenv/setup
 
-configureFlags="--enable-shared"
-
 preConfigure=preConfigure
 preConfigure() {
     # Workarounds for the ancient libtool shipped by libjpeg.
diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index 446c451ab68..b23c6fabf7b 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -1,14 +1,19 @@
-{stdenv, fetchurl, libtool}: 
+{stdenv, fetchurl, libtool, static ? false}: 
 
 stdenv.mkDerivation {
   name = "libjpeg-6b";
+  
   builder = ./builder.sh;
+  
   src = fetchurl {
     url = http://www.ijg.org/files/jpegsrc.v6b.tar.gz;
     md5 = "dbd5f3b47ed13132f04c685d608a7547";
   };
+  
   inherit libtool;
 
+  configureFlags = "--enable-shared ${if static then " --enable-static" else ""}";
+    
   # Required for building of dynamic libraries on Darwin.
   patches = [
     (fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7f09d5898d5..c767b41e59d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3409,14 +3409,12 @@ let
     inherit fetchurl stdenv mediastreamer;
   };
 
-  libjpeg = import ../development/libraries/libjpeg {
+  libjpeg = makeOverridable (import ../development/libraries/libjpeg) {
     inherit fetchurl stdenv;
     libtool = libtool_1_5;
   };
 
-  libjpegStatic = lowPrio (appendToName "static" (import ../development/libraries/libjpeg-static {
-    inherit fetchurl stdenv;
-    libtool = libtool_1_5;
+  libjpegStatic = lowPrio (appendToName "static" (libjpeg.override {
     static = true;
   }));