ilmbase, openexr: Use fetchurl
Also, enable parallel building. (cherry picked from commit 6c06d7467edea0a5163aeb53f72750abcb044bbe)
This commit is contained in:
parent
b65d351c30
commit
05baf485f6
|
@ -1,13 +1,12 @@
|
|||
{ stdenv, openexr, automake, autoconf, libtool, which }:
|
||||
{ stdenv, fetchurl, automake, autoconf, libtool, which }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ilmbase-${openexr.source.version}";
|
||||
|
||||
src = openexr.source.src;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ilmbase-2.2.0";
|
||||
|
||||
prePatch = ''
|
||||
cd IlmBase
|
||||
'';
|
||||
src = fetchurl {
|
||||
url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
|
||||
sha256 = "1izddjwbh1grs8080vmaix72z469qy29wrvkphgmqmcm0sv1by7c";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
./bootstrap
|
||||
|
|
|
@ -1,33 +1,28 @@
|
|||
{ stdenv, callPackage, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
|
||||
let
|
||||
source = callPackage ./source.nix { };
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openexr-${source.version}";
|
||||
|
||||
src = source.src;
|
||||
{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
|
||||
|
||||
prePatch = ''
|
||||
cd OpenEXR
|
||||
'';
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openexr-${lib.getVersion ilmbase}";
|
||||
|
||||
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;
|
||||
}
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
{ fetchFromGitHub }:
|
||||
rec {
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openexr";
|
||||
repo = "openexr";
|
||||
rev = "v${version}";
|
||||
sha256 = "030vj2jk3n65x1wl0rmxzpl1bd5mzmld2lzn7sg92svpnghry6a8";
|
||||
};
|
||||
}
|
Loading…
Reference in New Issue