From e7c9afc3471dd8b2b36595f64d4e29823e2fe8ac Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sat, 21 Dec 2024 12:40:33 -0800 Subject: [PATCH] openscad-unstable: 2024-12-06 -> 2024-12-21 --- pkgs/by-name/op/openscad-unstable/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index a10774a5ad9d..498198473291 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -44,12 +44,14 @@ # clang consume much less RAM than GCC clangStdenv.mkDerivation rec { pname = "openscad-unstable"; - version = "2024-12-06"; + version = "2024-12-21"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "fd3f465aa01b06f96c78ad525654390a83272d5e"; - hash = "sha256-B03fEKY9dkB+zFcTsuGzZYe7V5eR5h8vp+EceNk4ZtY="; + rev = "30cbdf6c7214be7cc00b4cca2cef8396e1d69498"; + hash = "sha256-wpw4JStAWNcHU6PoHGcIKAeVjtlTJsS4ZFMkTpj6xRk="; + # 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 }; @@ -116,6 +118,7 @@ clangStdenv.mkDerivation rec { "-DSNAPSHOT=ON" # nightly icons "-DUSE_BUILTIN_OPENCSG=OFF" "-DUSE_BUILTIN_MANIFOLD=OFF" + "-DUSE_BUILTIN_CLIPPER2=OFF" "-DOPENSCAD_VERSION=\"${builtins.replaceStrings [ "-" ] [ "." ] version}\"" "-DCMAKE_UNITY_BUILD=OFF" # broken compile with unity # IPO