diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:36 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:47 +0000 |
commit | 36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2 (patch) | |
tree | b3faaf573407b32aa645237a4d16b82778a39a92 /nixpkgs/pkgs/development/libraries/ilmbase | |
parent | 4e31070265257dc67d120c27e0f75c2344fdfa9a (diff) | |
parent | abf060725d7614bd3b9f96764262dfbc2f9c2199 (diff) | |
download | nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.gz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.bz2 nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.lz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.xz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.zst nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.zip |
Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/ilmbase')
3 files changed, 87 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/ilmbase/bootstrap.patch b/nixpkgs/pkgs/development/libraries/ilmbase/bootstrap.patch new file mode 100644 index 000000000000..db6af6daebd0 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/ilmbase/bootstrap.patch @@ -0,0 +1,15 @@ +diff -ur openexr-v2.2.0-src-orig/IlmBase/bootstrap openexr-v2.2.0-src/IlmBase/bootstrap +--- IlmBase/bootstrap 2015-03-31 01:02:41.000000000 -0400 ++++ IlmBase/bootstrap 2015-03-31 01:03:35.000000000 -0400 +@@ -47,11 +47,6 @@ + fi + } + +-# Check if /usr/local/share/aclocal exists +-if [ -d /usr/local/share/aclocal ]; then +- ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal" +-fi +- + run_cmd aclocal -I m4 $ACLOCAL_INCLUDE + run_cmd $LIBTOOLIZE --automake --copy + run_cmd automake --add-missing --copy diff --git a/nixpkgs/pkgs/development/libraries/ilmbase/cross.patch b/nixpkgs/pkgs/development/libraries/ilmbase/cross.patch new file mode 100644 index 000000000000..207a440a0d85 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/ilmbase/cross.patch @@ -0,0 +1,35 @@ +From: Helmut Grohne <> +Subject: compile build tools with the build architecture compiler + +Patch-Source: https://github.com/openexr/openexr/issues/221 + +Index: ilmbase-2.2.0/configure.ac +=================================================================== +--- ilmbase-2.2.0.orig/configure.ac ++++ ilmbase-2.2.0/configure.ac +@@ -28,6 +28,7 @@ + AC_PROG_LN_S + AC_PROG_LIBTOOL + AC_PROG_MAKE_SET ++AX_PROG_CXX_FOR_BUILD + + dnl + dnl PKGCONFIG preparations +Index: ilmbase-2.2.0/Half/Makefile.am +=================================================================== +--- ilmbase-2.2.0.orig/Half/Makefile.am ++++ ilmbase-2.2.0/Half/Makefile.am +@@ -17,9 +17,11 @@ + + CLEANFILES = eLut eLut.h toFloat toFloat.h + +-eLut_SOURCES = eLut.cpp ++eLut$(EXEEXT): eLut.cpp ++ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $< -o $@ + +-toFloat_SOURCES = toFloat.cpp ++toFloat$(EXEEXT): toFloat.cpp ++ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $< -o $@ + + eLut.h: eLut + ./eLut > eLut.h diff --git a/nixpkgs/pkgs/development/libraries/ilmbase/default.nix b/nixpkgs/pkgs/development/libraries/ilmbase/default.nix new file mode 100644 index 000000000000..98370f52e183 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/ilmbase/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which }: + +stdenv.mkDerivation rec { + name = "ilmbase-${version}"; + version = "2.3.0"; + + src = fetchurl { + url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz"; + sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5"; + }; + + outputs = [ "out" "dev" ]; + + preConfigure = '' + patchShebangs ./bootstrap + ./bootstrap + ''; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ automake autoconf libtool which ]; + + NIX_CFLAGS_LINK = [ "-pthread" ]; + + patches = [ ./bootstrap.patch ./cross.patch ]; + + # fails 1 out of 1 tests with + # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed" + # at least on i686. spooky! + doCheck = stdenv.isx86_64; + + meta = with stdenv.lib; { + homepage = http://www.openexr.com/; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} |