From 523c7be54a4cfc716f9b51825420e777677706b7 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 30 Jul 2026 15:48:28 +0200 Subject: [PATCH 1/3] collada-dom: add missing dependencies to avoid building the vendored ones in dom/external-libs --- pkgs/by-name/co/collada-dom/package.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/co/collada-dom/package.nix b/pkgs/by-name/co/collada-dom/package.nix index 685f01304dba..8e2af01b70d2 100644 --- a/pkgs/by-name/co/collada-dom/package.nix +++ b/pkgs/by-name/co/collada-dom/package.nix @@ -4,9 +4,14 @@ fetchFromGitHub, cmake, boost, + bzip2, libxml2, minizip, + pkg-config, + pcre-cpp, readline, + uriparser, + zlib, }: stdenv.mkDerivation (finalAttrs: { @@ -27,13 +32,20 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/include/*/* $out/include ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; buildInputs = [ boost + bzip2 libxml2 minizip + pcre-cpp readline + uriparser + zlib ]; meta = { From 09e933bb5154f51ce7fb7289d202f8cbf5a570e7 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 30 Jul 2026 16:05:47 +0200 Subject: [PATCH 2/3] collada-dom: doCheck --- pkgs/by-name/co/collada-dom/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/co/collada-dom/package.nix b/pkgs/by-name/co/collada-dom/package.nix index 8e2af01b70d2..af9b80b6875f 100644 --- a/pkgs/by-name/co/collada-dom/package.nix +++ b/pkgs/by-name/co/collada-dom/package.nix @@ -48,6 +48,12 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; + cmakeFlags = [ + (lib.cmakeBool "OPT_COMPILE_TESTS" finalAttrs.doCheck) + ]; + + doCheck = true; + meta = { description = "API that provides a C++ object representation of a COLLADA XML instance document"; longDescription = "This is a fork of [rdiankov/collada-dom](https://github.com/rdiankov/collada-dom) which has been unmaintained for six years."; From 5ea859f95cbed2592f43af9279f715b8ef6bde82 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 30 Jul 2026 17:19:48 +0200 Subject: [PATCH 3/3] collada-dom: 2.5.3 -> 2.5.4 Diff: https://github.com/Gepetto/collada-dom/compare/v2.5.3...v2.5.4 Changelog: https://github.com/Gepetto/collada-dom/releases/tag/v2.5.4 --- pkgs/by-name/co/collada-dom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/collada-dom/package.nix b/pkgs/by-name/co/collada-dom/package.nix index af9b80b6875f..b4e8ac23cdab 100644 --- a/pkgs/by-name/co/collada-dom/package.nix +++ b/pkgs/by-name/co/collada-dom/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "collada-dom"; - version = "2.5.3"; + version = "2.5.4"; __structuredAttrs = true; strictDeps = true; @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Gepetto"; repo = "collada-dom"; tag = "v${finalAttrs.version}"; - hash = "sha256-vkbQvgY1ISOhbDeEmLuOWRfwQsOZRffUi3tpT/G33KY="; + hash = "sha256-6V1Ew1YWybgqt0dikNdXwK+4D1odgVN/7NvaikjRqE4="; }; postInstall = ''