pyrox.dev
opencollada: homogenize and patch for cmake4 (#445329)
+22
-5
pkgs/by-name/op/opencollada/package.nix
+22
-5
pkgs/by-name/op/opencollada/package.nix
···
1
1
{
2
2
cmake,
3
+
dos2unix,
3
4
fetchFromGitHub,
4
-
fetchurl,
5
+
fetchpatch,
5
6
lib,
6
7
libxml2,
7
8
pcre,
···
20
21
sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w";
21
22
};
22
23
24
+
# Fix freaky dos-style CLRF things
25
+
prePatch = ''
26
+
dos2unix CMakeLists.txt
27
+
'';
28
+
23
29
patches = [
24
-
./pcre.patch
25
-
26
30
# fix build with gcc 13
27
-
(fetchurl {
31
+
(fetchpatch {
28
32
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch?id=b76590f9fb8615da3da9d783ad841c0e3881a27b";
29
-
hash = "sha256-uimeLGHgXaFi61mmoaloJ5vo83c8EIQmtHEMngC2Nq4=";
33
+
hash = "sha256-oi/QhNPRnuSHfJJ071/3wnjLeg4zZUL6NwSGYvgkb/k=";
34
+
})
35
+
36
+
# fix pcre
37
+
(fetchpatch {
38
+
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/opencollada/files/opencollada-1.6.63-pcre-fix.patch";
39
+
hash = "sha256-igrwgmNwDKYwj6xWvWrryT5ARWJpztVmlQ0HCLQn5+Q=";
40
+
})
41
+
42
+
# fix build with cmake 4
43
+
(fetchpatch {
44
+
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/opencollada/files/opencollada-1.6.68-cmake4.patch?id=42f1e0614c4d056841fdc162c29a04ff0e910139";
45
+
hash = "sha256-gbF6PPalJGgXGu4W7EptYeDq8418JdGH50LIqKqGKX0=";
30
46
})
31
47
];
32
48
···
43
59
nativeBuildInputs = [
44
60
cmake
45
61
pkg-config
62
+
dos2unix
46
63
];
47
64
48
65
propagatedBuildInputs = [
-14
pkgs/by-name/op/opencollada/pcre.patch
-14
pkgs/by-name/op/opencollada/pcre.patch
···
1
-
diff --git a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
2
-
index 22f2598b..269c50ca 100644
3
-
--- a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
4
-
+++ b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
5
-
@@ -13,8 +13,7 @@
6
-
7
-
#include "COLLADABUPrerequisites.h"
8
-
9
-
-struct real_pcre;
10
-
-typedef struct real_pcre pcre;
11
-
+#include "pcre.h"
12
-
13
-
14
-
namespace COLLADABU