diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-02 14:27:47 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-02 15:36:37 +0200 |
commit | 05baf485f6bc1acc463b37693ac33846beaa854a (patch) | |
tree | 43dbc1212e3974fee21e4556e3b417b85b16b2b1 /pkgs/development/libraries/openexr | |
parent | b65d351c30ffa5a69f9614468c28b7b435339024 (diff) | |
download | nixlib-05baf485f6bc1acc463b37693ac33846beaa854a.tar nixlib-05baf485f6bc1acc463b37693ac33846beaa854a.tar.gz nixlib-05baf485f6bc1acc463b37693ac33846beaa854a.tar.bz2 nixlib-05baf485f6bc1acc463b37693ac33846beaa854a.tar.lz nixlib-05baf485f6bc1acc463b37693ac33846beaa854a.tar.xz nixlib-05baf485f6bc1acc463b37693ac33846beaa854a.tar.zst nixlib-05baf485f6bc1acc463b37693ac33846beaa854a.zip |
ilmbase, openexr: Use fetchurl
Also, enable parallel building. (cherry picked from commit 6c06d7467edea0a5163aeb53f72750abcb044bbe)
Diffstat (limited to 'pkgs/development/libraries/openexr')
-rw-r--r-- | pkgs/development/libraries/openexr/default.nix | 25 | ||||
-rw-r--r-- | pkgs/development/libraries/openexr/source.nix | 11 |
2 files changed, 10 insertions, 26 deletions
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 63a8c11a3416..71420ba425c9 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,33 +1,28 @@ -{ stdenv, callPackage, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: -let - source = callPackage ./source.nix { }; -in +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: + stdenv.mkDerivation rec { - name = "openexr-${source.version}"; - - src = source.src; + name = "openexr-${lib.getVersion ilmbase}"; - prePatch = '' - cd OpenEXR - ''; + src = fetchurl { + url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; + sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n"; + }; preConfigure = '' ./bootstrap ''; - configureFlags = [ "--enable-imfexamples" ]; - buildInputs = [ autoconf automake libtool pkgconfig ]; propagatedBuildInputs = [ ilmbase zlib ]; + enableParallelBuilding = true; + patches = [ ./bootstrap.patch ]; - + meta = with stdenv.lib; { homepage = http://www.openexr.com/; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; }; - - passthru.source = source; } diff --git a/pkgs/development/libraries/openexr/source.nix b/pkgs/development/libraries/openexr/source.nix deleted file mode 100644 index 30675dc54ec0..000000000000 --- a/pkgs/development/libraries/openexr/source.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ fetchFromGitHub }: -rec { - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "openexr"; - repo = "openexr"; - rev = "v${version}"; - sha256 = "030vj2jk3n65x1wl0rmxzpl1bd5mzmld2lzn7sg92svpnghry6a8"; - }; -} |