diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2007-10-12 20:33:03 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2007-10-12 20:33:03 +0000 |
| commit | 8a0194b4e5b3a201ae444d8408e23de9445edfab (patch) | |
| tree | 972b77f68514f280562f5bc2526cb4a1c25418b1 | |
| parent | 203c2361354db92c707f02e81feb9eaae7d75573 (diff) | |
| download | nixlib-8a0194b4e5b3a201ae444d8408e23de9445edfab.tar nixlib-8a0194b4e5b3a201ae444d8408e23de9445edfab.tar.gz nixlib-8a0194b4e5b3a201ae444d8408e23de9445edfab.tar.bz2 nixlib-8a0194b4e5b3a201ae444d8408e23de9445edfab.tar.lz nixlib-8a0194b4e5b3a201ae444d8408e23de9445edfab.tar.xz nixlib-8a0194b4e5b3a201ae444d8408e23de9445edfab.tar.zst nixlib-8a0194b4e5b3a201ae444d8408e23de9445edfab.zip | |
Added OpenEXR and ilmbase. Actually, ilmbase is a part of OpenEXR
svn path=/nixpkgs/trunk/; revision=9457
| -rw-r--r-- | pkgs/development/libraries/ilmbase/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/openexr/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
3 files changed, 23 insertions, 5 deletions
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix new file mode 100644 index 000000000000..49fae13aec88 --- /dev/null +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -0,0 +1,9 @@ +args: with args; +stdenv.mkDerivation { + name = "ilmbase-1.0.0"; + src = fetchurl { + url = http://FIXME/ilmbase-1.0.0.tar.gz; + sha256 = "1dpgi3hbff9nflg95r2smb6ssg5bh5g8mj9dxh896w29nh08ipnz"; + }; + configureFlags = "--enable-shared --disable-static"; +} diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 17acebe7489f..e30f25d9778d 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,10 +1,11 @@ -{stdenv, fetchurl, zlib}: +args: with args; stdenv.mkDerivation { - name = "openexr-1.2.2"; + name = "openexr-1.6.0"; src = fetchurl { - url = http://savannah.nongnu.org/download/openexr/OpenEXR-1.2.2.tar.gz; - md5 = "a2e56af78dc47c7294ff188c8f78394b"; + url = http://FIXME/openexr-1.6.0.tar.gz; + sha256 = "0mzbwavkbj26g43ar5jhdrqlvw9nq1mxh9l2044sqlcyharcnfq4"; }; - buildInputs = [zlib]; + propagatedBuildInputs = [pkgconfig zlib ilmbase]; + configureFlags = "--enable-shared --disable-static --enable-imfexamples"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47c9d81c99ba..59ae4f42e3c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1717,6 +1717,10 @@ rec { inherit fetchurl stdenv; }; + ilmbase = import ../development/libraries/ilmbase { + inherit fetchurl stdenv; + }; + imlib = import ../development/libraries/imlib { inherit fetchurl stdenv libjpeg libtiff libungif libpng; inherit (xlibs) libX11 libXext xextproto; @@ -1950,6 +1954,10 @@ rec { inherit fetchurl stdenv alsaLib autoconf automake libtool; }; + openexr = import ../development/libraries/openexr { + inherit fetchurl stdenv ilmbase zlib pkgconfig; + }; + openldap = import ../development/libraries/openldap { inherit fetchurl stdenv openssl cyrus_sasl db4; }; |