diff --git a/pkgs/development/libraries/ilmbase/bootstrap.patch b/pkgs/development/libraries/ilmbase/bootstrap.patch new file mode 100644 index 000000000000..db6af6daebd0 --- /dev/null +++ b/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/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 7f8147261cec..816a9c023e1d 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, openexr, automake, autoconf, libtool }: +{ stdenv, openexr, automake, autoconf, libtool, which }: stdenv.mkDerivation { name = "ilmbase-${openexr.source.version}"; @@ -13,7 +13,9 @@ stdenv.mkDerivation { ./bootstrap ''; - buildInputs = [ automake autoconf libtool ]; + buildInputs = [ automake autoconf libtool which ]; + + patches = [ ./bootstrap.patch ]; meta = with stdenv.lib; { homepage = http://www.openexr.com/; diff --git a/pkgs/development/libraries/openexr/bootstrap.patch b/pkgs/development/libraries/openexr/bootstrap.patch new file mode 100644 index 000000000000..af6669c16a45 --- /dev/null +++ b/pkgs/development/libraries/openexr/bootstrap.patch @@ -0,0 +1,15 @@ +diff -ur openexr-v2.2.0-src-orig/OpenEXR/bootstrap openexr-v2.2.0-src/OpenEXR/bootstrap +--- OpenEXR/bootstrap 2015-03-31 01:02:41.000000000 -0400 ++++ OpenEXR/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/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index fcb27c2c0cca..63a8c11a3416 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake libtool pkgconfig ]; propagatedBuildInputs = [ ilmbase zlib ]; + + patches = [ ./bootstrap.patch ]; meta = with stdenv.lib; { homepage = http://www.openexr.com/;