@@ -29,33 +29,15 @@
2929
3030stdenv.mkDerivation rec {
3131 pname = "vengi-tools";
32− version = "0.0.17";
32+ version = "0.0.18";
3333
3434 src = fetchFromGitHub {
3535 owner = "mgerhardy";
3636 repo = "vengi";
3737 rev = "v${version}";
38− sha256 = "sha256-h+R9L0BBD3NSFWUh43g4V2LBcNyqVInBeJiOLY03nRk=";
38+ sha256 = "sha256-Ur1X5FhOa87jbjWBXievBfCHW+qP/8bqLiyKAC8+KU4=";
3939 };
4040
41− # Patch from the project's author for fixing an issue with AnimationShaders.h
42− # not being included when turning off some components
43− patches = [(writeText "vengi-tools-fix-build.patch" ''
44− diff --git a/src/modules/voxelworldrender/CMakeLists.txt b/src/modules/voxelworldrender/CMakeLists.txt
45− index aebe5f97b..903e62b37 100644
46− --- a/src/modules/voxelworldrender/CMakeLists.txt
47− +++ b/src/modules/voxelworldrender/CMakeLists.txt
48− @@ -27,7 +27,7 @@ set(FILES
49− voxel/models/plants/3.qb
50− voxel/models/plants/4.qb
51− )
52− -engine_add_module(TARGET ''${LIB} SRCS ''${SRCS} ''${SRCS_SHADERS} FILES ''${FILES} DEPENDENCIES frontend voxelrender)
53− +engine_add_module(TARGET ''${LIB} SRCS ''${SRCS} ''${SRCS_SHADERS} FILES ''${FILES} DEPENDENCIES animation frontend voxelrender)
54− generate_shaders(''${LIB} world water postprocess)
55−
56− set(TEST_SRCS
57− '')];
58−
5941 nativeBuildInputs = [
6042 cmake
6143 pkg-config
@@ -105,9 +87,7 @@ stdenv.mkDerivation rec {
10587 '';
10688
10789 passthru.tests = {
108− # There used to be a roundtrip test here, but it started failing on 0.0.17
109− # Relevant upstream ticket:
110− # https://github.com/mgerhardy/vengi/issues/113
90+ voxconvert-roundtrip = callPackage ./test-voxconvert-roundtrip.nix {};
11191 voxconvert-all-formats = callPackage ./test-voxconvert-all-formats.nix {};
11292 run-voxedit = nixosTests.vengi-tools;
11393 };