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

Fix impurity in OpenEXR + IlmBase

Browse Source
This commit is contained in:
Spencer Whitt 2015-03-31 01:27:36 -04:00
parent dcde8a967f
commit 4012535571
4 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/ilmbase/bootstrap.patch Normal file
View File

@ -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

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

@ -1,4 +1,4 @@
{ stdenv, openexr, automake, autoconf, libtool }: { stdenv, openexr, automake, autoconf, libtool, which }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ilmbase-${openexr.source.version}"; name = "ilmbase-${openexr.source.version}";
@ -13,7 +13,9 @@ stdenv.mkDerivation {
./bootstrap ./bootstrap
''; '';
buildInputs = [ automake autoconf libtool ]; buildInputs = [ automake autoconf libtool which ];
patches = [ ./bootstrap.patch ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.openexr.com/; homepage = http://www.openexr.com/;

15
pkgs/development/libraries/openexr/bootstrap.patch Normal file
View File

@ -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

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

@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
buildInputs = [ autoconf automake libtool pkgconfig ]; buildInputs = [ autoconf automake libtool pkgconfig ];
propagatedBuildInputs = [ ilmbase zlib ]; propagatedBuildInputs = [ ilmbase zlib ];
patches = [ ./bootstrap.patch ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.openexr.com/; homepage = http://www.openexr.com/;
license = licenses.bsd3; license = licenses.bsd3;