diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index 404a62c5fbcf..358c8cda592f 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patchPhase = lib.optionalString stdenv.isDarwin '' + patchPhase = '' + patch -p1 < ${./pcre.patch} + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \ --replace math.h cmath ''; diff --git a/pkgs/development/libraries/opencollada/pcre.patch b/pkgs/development/libraries/opencollada/pcre.patch new file mode 100644 index 000000000000..39408f5a61e3 --- /dev/null +++ b/pkgs/development/libraries/opencollada/pcre.patch @@ -0,0 +1,14 @@ +diff --git a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h +index 22f2598b..269c50ca 100644 +--- a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h ++++ b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h +@@ -13,8 +13,7 @@ + + #include "COLLADABUPrerequisites.h" + +-struct real_pcre; +-typedef struct real_pcre pcre; ++#include "pcre.h" + + + namespace COLLADABU