movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

openscad-unstable: 2025-02-07 -> 2025-05-17 (#409444)

Browse source
This commit is contained in:
7c6f434c 2025-05-31 13:34:50 +00:00 • committed by GitHub
commit 326d2f9bcf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
pkgs/by-name/op/openscad-unstable/package.nix
View file

@ -30,11 +30,10 @@
libsForQt5, libsForQt5,
libspnav, libspnav,
libzip, libzip,
manifold,
mesa, mesa,
mpfr, mpfr,
python3, python3,
tbb_2021_11, tbb_2022_0,
wayland, wayland,
wayland-protocols, wayland-protocols,
wrapGAppsHook3, wrapGAppsHook3,
@ -46,15 +45,13 @@
# clang consume much less RAM than GCC # clang consume much less RAM than GCC
clangStdenv.mkDerivation rec { clangStdenv.mkDerivation rec {
pname = "openscad-unstable"; pname = "openscad-unstable";
version = "2025-02-07"; version = "2025-05-17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openscad"; owner = "openscad";
repo = "openscad"; repo = "openscad";
rev = "1308a7d476facb466bf9fae1e77666c35c8e3c8f"; rev = "c76900f9a62fcb98c503dcc5ccce380db8ac564b";
hash = "sha256-+0cQ5mgRzOPfP6nl/rfC/hnw3V7yvGJCyLU8hOmlGOc="; hash = "sha256-R2/8T5+BugVTRIUVLaz6SxKQ1YrtyAGbiE4K1Fuc6bg=";
# Unfortunately, we can't selectively fetch submodules. It would be good fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD and manifold
# to see that we don't accidentally depend on it.
fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD
}; };
patches = [ ./test.diff ]; patches = [ ./test.diff ];
@ -81,7 +78,7 @@ clangStdenv.mkDerivation rec {
[ [
clipper2 clipper2
glm glm
tbb_2021_11 tbb_2022_0
mimalloc mimalloc
boost boost
cairo cairo
@ -99,7 +96,6 @@ clangStdenv.mkDerivation rec {
lib3mf lib3mf
libspnav libspnav
libzip libzip
manifold
mpfr mpfr
qscintilla qscintilla
qtbase qtbase
@ -119,7 +115,9 @@ clangStdenv.mkDerivation rec {
"-DEXPERIMENTAL=ON" # enable experimental options "-DEXPERIMENTAL=ON" # enable experimental options
"-DSNAPSHOT=ON" # nightly icons "-DSNAPSHOT=ON" # nightly icons
"-DUSE_BUILTIN_OPENCSG=OFF" "-DUSE_BUILTIN_OPENCSG=OFF"
"-DUSE_BUILTIN_MANIFOLD=OFF" # use builtin manifold: 3.1.0 doesn't pass tests, builtin is 7c8fbe1, between 3.0.1 and 3.1.0
# FIXME revisit on version update
"-DUSE_BUILTIN_MANIFOLD=ON"
"-DUSE_BUILTIN_CLIPPER2=OFF" "-DUSE_BUILTIN_CLIPPER2=OFF"
"-DOPENSCAD_VERSION=\"${builtins.replaceStrings [ "-" ] [ "." ] version}\"" "-DOPENSCAD_VERSION=\"${builtins.replaceStrings [ "-" ] [ "." ] version}\""
"-DCMAKE_UNITY_BUILD=OFF" # broken compile with unity "-DCMAKE_UNITY_BUILD=OFF" # broken compile with unity
@ -135,6 +133,14 @@ clangStdenv.mkDerivation rec {
# tests rely on sysprof which is not available on darwin # tests rely on sysprof which is not available on darwin
doCheck = !stdenv.hostPlatform.isDarwin; 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 '' postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir $out/Applications mkdir $out/Applications
mv $out/bin/*.app $out/Applications mv $out/bin/*.app $out/Applications