diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-23 13:26:14 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-23 13:26:14 +0000 |
| commit | 0f10222e4ecee30837fe7631a37e343ccf82f49f (patch) | |
| tree | cb9cdf9e7852290c6c7fa963bc4f072191ba5220 /pkgs/development/libraries/libjpeg | |
| parent | 6e32a4cea848a3a11fcb7801bcc4e5761b9029c4 (diff) | |
| download | nixpkgs-0f10222e4ecee30837fe7631a37e343ccf82f49f.tar nixpkgs-0f10222e4ecee30837fe7631a37e343ccf82f49f.tar.gz nixpkgs-0f10222e4ecee30837fe7631a37e343ccf82f49f.tar.bz2 nixpkgs-0f10222e4ecee30837fe7631a37e343ccf82f49f.tar.lz nixpkgs-0f10222e4ecee30837fe7631a37e343ccf82f49f.tar.xz nixpkgs-0f10222e4ecee30837fe7631a37e343ccf82f49f.tar.zst nixpkgs-0f10222e4ecee30837fe7631a37e343ccf82f49f.zip | |
* Merge libjpeg and libjpeg-static.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15275
Diffstat (limited to 'pkgs/development/libraries/libjpeg')
| -rw-r--r-- | pkgs/development/libraries/libjpeg/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libjpeg/default.nix | 7 |
2 files changed, 6 insertions, 3 deletions
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 { |