public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ilmbase, openexr: Use fetchurl

Browse Source 
Also, enable parallel building.

(cherry picked from commit 6c06d7467edea0a5163aeb53f72750abcb044bbe)
This commit is contained in:
Eelco Dolstra 2015-07-02 14:27:47 +02:00
parent b65d351c30
commit 05baf485f6
3 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/ilmbase/default.nix
View File

@ -1,13 +1,12 @@
{ stdenv, openexr, automake, autoconf, libtool, which }: { stdenv, fetchurl, automake, autoconf, libtool, which }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "ilmbase-${openexr.source.version}"; name = "ilmbase-2.2.0";
src = openexr.source.src; src = fetchurl {
url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
prePatch = '' sha256 = "1izddjwbh1grs8080vmaix72z469qy29wrvkphgmqmcm0sv1by7c";
cd IlmBase };
'';
preConfigure = '' preConfigure = ''
./bootstrap ./bootstrap

23
pkgs/development/libraries/openexr/default.nix
View File

@ -1,25 +1,22 @@
{ stdenv, callPackage, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: { lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
let
source = callPackage ./source.nix { };
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openexr-${source.version}"; name = "openexr-${lib.getVersion ilmbase}";
src = source.src; src = fetchurl {
url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
prePatch = '' sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n";
cd OpenEXR };
'';
preConfigure = '' preConfigure = ''
./bootstrap ./bootstrap
''; '';
configureFlags = [ "--enable-imfexamples" ];
buildInputs = [ autoconf automake libtool pkgconfig ]; buildInputs = [ autoconf automake libtool pkgconfig ];
propagatedBuildInputs = [ ilmbase zlib ]; propagatedBuildInputs = [ ilmbase zlib ];
enableParallelBuilding = true;
patches = [ ./bootstrap.patch ]; patches = [ ./bootstrap.patch ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -28,6 +25,4 @@ stdenv.mkDerivation rec {
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ wkennington ]; maintainers = with maintainers; [ wkennington ];
}; };
passthru.source = source;
} }

11
pkgs/development/libraries/openexr/source.nix
View File

@ -1,11 +0,0 @@
{ fetchFromGitHub }:
rec {
version = "2.2.0";
src = fetchFromGitHub {
owner = "openexr";
repo = "openexr";
rev = "v${version}";
sha256 = "030vj2jk3n65x1wl0rmxzpl1bd5mzmld2lzn7sg92svpnghry6a8";
};
}