Unverified Commit 326d2f9b authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

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

parents 85e36143 eed3d892

pkgs/by-name/op/openscad-unstable/package.nix

+17 −11
Original line number Diff line number Diff line
@@ -30,11 +30,10 @@ 
  libsForQt5,

  libspnav,

  libzip,

  manifold,

  mesa,

  mpfr,

  python3,

  tbb_2021_11,

  tbb_2022_0,

  wayland,

  wayland-protocols,

  wrapGAppsHook3,
@@ -46,15 +45,13 @@ 
# clang consume much less RAM than GCC

clangStdenv.mkDerivation rec {

  pname = "openscad-unstable";

  version = "2025-02-07";

  version = "2025-05-17";

  src = fetchFromGitHub {

    owner = "openscad";

    repo = "openscad";

    rev = "1308a7d476facb466bf9fae1e77666c35c8e3c8f";

    hash = "sha256-+0cQ5mgRzOPfP6nl/rfC/hnw3V7yvGJCyLU8hOmlGOc=";

    # 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

    rev = "c76900f9a62fcb98c503dcc5ccce380db8ac564b";

    hash = "sha256-R2/8T5+BugVTRIUVLaz6SxKQ1YrtyAGbiE4K1Fuc6bg=";

    fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD and manifold

  };



  patches = [ ./test.diff ];
@@ -81,7 +78,7 @@ clangStdenv.mkDerivation rec { 
    [

      clipper2

      glm

      tbb_2021_11

      tbb_2022_0

      mimalloc

      boost

      cairo
@@ -99,7 +96,6 @@ clangStdenv.mkDerivation rec { 
      lib3mf

      libspnav

      libzip

      manifold

      mpfr

      qscintilla

      qtbase
@@ -119,7 +115,9 @@ clangStdenv.mkDerivation rec { 
    "-DEXPERIMENTAL=ON" # enable experimental options

    "-DSNAPSHOT=ON" # nightly icons

    "-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"

    "-DOPENSCAD_VERSION=\"${builtins.replaceStrings [ "-" ] [ "." ] version}\""

    "-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

  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