pyrox.dev
assimp: 5.4.3 -> 6.0.2, modernize (#422357)
+29
-14
pkgs/by-name/as/assimp/package.nix
+29
-14
pkgs/by-name/as/assimp/package.nix
···
4
4
fetchFromGitHub,
5
5
cmake,
6
6
zlib,
7
+
nix-update-script,
7
8
}:
8
9
9
-
stdenv.mkDerivation rec {
10
+
stdenv.mkDerivation (finalAttrs: {
10
11
pname = "assimp";
11
-
version = "5.4.3";
12
+
version = "6.0.2";
12
13
outputs = [
13
14
"out"
14
15
"lib"
···
18
19
src = fetchFromGitHub {
19
20
owner = "assimp";
20
21
repo = "assimp";
21
-
rev = "v${version}";
22
-
hash = "sha256-sOYhYHBz3Tg+pi1OIJ1mGmsjEc6dPO6nFH0aolfpLRA=";
22
+
tag = "v${finalAttrs.version}";
23
+
hash = "sha256-ixtqK+3iiL17GEbEVHz5S6+gJDDQP7bVuSfRMJMGEOY=";
23
24
};
24
25
25
26
nativeBuildInputs = [ cmake ];
27
+
26
28
buildInputs = [
27
29
zlib
28
30
];
29
31
30
-
cmakeFlags = [ "-DASSIMP_BUILD_ASSIMP_TOOLS=ON" ];
32
+
strictDeps = true;
33
+
enableParallelBuilding = true;
34
+
35
+
cmakeFlags = [
36
+
(lib.cmakeBool "ASSIMP_BUILD_ASSIMP_TOOLS" true)
37
+
];
38
+
39
+
# Some matrix tests fail on non-86_64-linux:
40
+
# https://github.com/assimp/assimp/issues/6246
41
+
# https://github.com/assimp/assimp/issues/6247
42
+
doCheck = !(stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isx86_64);
43
+
checkPhase = ''
44
+
runHook preCheck
45
+
bin/unit
46
+
runHook postCheck
47
+
'';
31
48
32
-
env.NIX_CFLAGS_COMPILE = toString ([
33
-
# Needed with GCC 12
34
-
"-Wno-error=array-bounds"
35
-
]);
49
+
passthru.updateScript = nix-update-script { };
36
50
37
-
meta = with lib; {
51
+
meta = {
52
+
changelog = "https://github.com/assimp/assimp/releases/tag/${finalAttrs.src.tag}";
38
53
description = "Library to import various 3D model formats";
39
54
mainProgram = "assimp";
40
55
homepage = "https://www.assimp.org/";
41
-
license = licenses.bsd3;
42
-
maintainers = with maintainers; [ ehmry ];
43
-
platforms = platforms.linux ++ platforms.darwin;
56
+
license = lib.licenses.bsd3;
57
+
maintainers = [ ];
58
+
platforms = lib.platforms.linux ++ lib.platforms.darwin;
44
59
};
45
-
}
60
+
})
+14
pkgs/development/libraries/qt-6/modules/qt3d.nix
+14
pkgs/development/libraries/qt-6/modules/qt3d.nix
···
1
1
{
2
+
lib,
2
3
qtModule,
3
4
qtbase,
4
5
qtdeclarative,
···
8
9
9
10
qtModule {
10
11
pname = "qt3d";
12
+
13
+
# make absolutely sure the vendored assimp is not used
14
+
# patch cmake to accept assimp 6.x versions
15
+
postPatch = ''
16
+
rm -rf src/3rdparty/assimp/src
17
+
substituteInPlace src/core/configure.cmake --replace-fail "WrapQt3DAssimp 5" "WrapQt3DAssimp 6"
18
+
'';
19
+
11
20
propagatedBuildInputs = [
12
21
qtbase
13
22
qtdeclarative
14
23
qtmultimedia
15
24
assimp
25
+
];
26
+
27
+
cmakeFlags = [
28
+
(lib.cmakeBool "FEATURE_qt3d_system_assimp" true) # use nix assimp
29
+
(lib.cmakeBool "TEST_assimp" true) # required for internal cmake asserts
16
30
];
17
31
}