From eed3d892a9bcc183ed69931b95c09552fe559883 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 29 May 2025 14:53:48 +0200 Subject: [PATCH] openscad-unstable: remove unused submodules --- pkgs/by-name/op/openscad-unstable/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index eda4bed9d527..8b14c7e8cfef 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -51,9 +51,7 @@ clangStdenv.mkDerivation rec { repo = "openscad"; rev = "c76900f9a62fcb98c503dcc5ccce380db8ac564b"; hash = "sha256-R2/8T5+BugVTRIUVLaz6SxKQ1YrtyAGbiE4K1Fuc6bg="; - # Unfortunately, we can't selectively fetch submodules. It would be good - # to see that we don't accidentally depend on it. - fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD + fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD and manifold }; patches = [ ./test.diff ]; @@ -135,6 +133,14 @@ clangStdenv.mkDerivation rec { # tests rely on sysprof which is not available on darwin doCheck = !stdenv.hostPlatform.isDarwin; + # remove unused submodules, to ensure correct dependency usage + postUnpack = '' + ( cd $sourceRoot + for m in submodules/OpenCSG submodules/mimalloc submodules/Clipper2 + do rm -r $m + done ) + ''; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/bin/*.app $out/Applications