diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/ilmbase/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/libraries/openexr/default.nix | 25 | ||||
-rw-r--r-- | pkgs/development/libraries/openexr/source.nix | 11 |
3 files changed, 17 insertions, 34 deletions
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 816a9c023e1d..742048c9ae66 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -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 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"; - }; -} |