diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-08-02 16:44:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 16:44:08 -0400 |
| commit | 117680b0e9f4472e6161427ac0814fc2c6f998ba (patch) | |
| tree | 5fb435954e215dfe1a4f50edce2edd981b307bfe /pkgs/development/libraries/opencollada | |
| parent | 405cc5b1a0d4daa7ca5f73781f407dbbf322e3a0 (diff) | |
| parent | 6f62bf31c197e1c736d31cd4b23f94c2caf7affb (diff) | |
Merge pull request #44126 from eadwu/opencollada/resolve-pcre-declarations
opencollada: include pcre.h (KhronosGroup/OpenCOLLADA#570)
Diffstat (limited to 'pkgs/development/libraries/opencollada')
| -rw-r--r-- | pkgs/development/libraries/opencollada/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencollada/pcre.patch | 14 |
2 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index 404a62c5fbcf2..358c8cda592fb 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 0000000000000..39408f5a61e38 --- /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 |