From 3f8d6596fa5eec7befe517d5df95828aa6eb57e9 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Mon, 26 May 2025 13:02:35 +0200 Subject: [PATCH] openscenegraph: guard pcre behind collada support As per upstream, pcre is only required for collada support [1]. Therefore, it makes little sense to include pcre (an EOL library) in the default build. [1] https://github.com/openscenegraph/OpenSceneGraph/blob/2e4ae2ea94595995c1fc56860051410b0c0be605/CMakeModules/FindCOLLADA.cmake#L222-L256 --- 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 ef95cbcdb125..e4c12742965b 100644 --- a/pkgs/by-name/op/openscenegraph/package.nix +++ b/pkgs/by-name/op/openscenegraph/package.nix @@ -88,7 +88,6 @@ stdenv.mkDerivation rec { ++ [ glib libxml2 - pcre zlib ] ++ lib.optional jpegSupport libjpeg @@ -98,7 +97,10 @@ stdenv.mkDerivation rec { ++ lib.optional tiffSupport libtiff ++ lib.optional gdalSupport gdal ++ lib.optional curlSupport curl - ++ lib.optional colladaSupport opencollada + ++ lib.optionals colladaSupport [ + opencollada + pcre + ] ++ lib.optional opencascadeSupport opencascade-occt ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional nvttSupport nvidia-texture-tools