From 45bd9d6f122e3bc09a38b36042493e662ec8c657 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sun, 6 Jul 2025 23:56:41 +0000 Subject: [PATCH] openscenegraph: fix collada implementation `opencollada` is not the same as `collada-dom`. OpenSceneGraph requires `collada-dom` to generate some shared object files required by OpenMW. Co-authored-by: Marius David Signed-off-by: Fernando Rodrigues --- pkgs/by-name/op/openscenegraph/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openscenegraph/package.nix b/pkgs/by-name/op/openscenegraph/package.nix index e4c12742965b..b1f9dcb63d9a 100644 --- a/pkgs/by-name/op/openscenegraph/package.nix +++ b/pkgs/by-name/op/openscenegraph/package.nix @@ -32,7 +32,7 @@ curlSupport ? true, curl, colladaSupport ? false, - opencollada, + collada-dom, opencascadeSupport ? false, opencascade-occt, ffmpegSupport ? false, @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { ++ lib.optional gdalSupport gdal ++ lib.optional curlSupport curl ++ lib.optionals colladaSupport [ - opencollada + collada-dom pcre ] ++ lib.optional opencascadeSupport opencascade-occt @@ -115,6 +115,8 @@ stdenv.mkDerivation rec { ++ lib.optionals withExamples [ fltk ] ++ lib.optional (restSupport || colladaSupport) boost; + env = lib.optionalAttrs colladaSupport { COLLADA_DIR = collada-dom; }; + patches = [ (fetchpatch { name = "opencascade-api-patch";