summary refs log tree commit diff
path: root/pkgs/development/libraries/libjpeg/default.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2010-01-21 21:42:17 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2010-01-21 21:42:17 +0000
commited3ebb7c2cae0a1f5ebc411ce553f5ce3a3c6e57 (patch)
treee75cb624cffaf4230d3ce0d6753ad16eef1dc437 /pkgs/development/libraries/libjpeg/default.nix
parent8b4f33ac7690d3dcf02618898dc81f6723a7269e (diff)
downloadnixpkgs-ed3ebb7c2cae0a1f5ebc411ce553f5ce3a3c6e57.tar
nixpkgs-ed3ebb7c2cae0a1f5ebc411ce553f5ce3a3c6e57.tar.gz
nixpkgs-ed3ebb7c2cae0a1f5ebc411ce553f5ce3a3c6e57.tar.bz2
nixpkgs-ed3ebb7c2cae0a1f5ebc411ce553f5ce3a3c6e57.tar.lz
nixpkgs-ed3ebb7c2cae0a1f5ebc411ce553f5ce3a3c6e57.tar.xz
nixpkgs-ed3ebb7c2cae0a1f5ebc411ce553f5ce3a3c6e57.tar.zst
nixpkgs-ed3ebb7c2cae0a1f5ebc411ce553f5ce3a3c6e57.zip
* 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
Diffstat (limited to 'pkgs/development/libraries/libjpeg/default.nix')
-rw-r--r--pkgs/development/libraries/libjpeg/default.nix10
1 files changed, 4 insertions, 6 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";