From cb2baca778ca1531da3bdf0cb93b001c5c4dec67 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 21 Sep 2025 23:35:44 +0200 Subject: [PATCH] meshlab: darwin updates - fix CMake exports - add missing library - update to llvm 19 Co-authored-by: Zexin Yuan --- pkgs/by-name/me/meshlab/package.nix | 5 ++++- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/meshlab/package.nix b/pkgs/by-name/me/meshlab/package.nix index 5cc3917cd741..0be074cf79e1 100644 --- a/pkgs/by-name/me/meshlab/package.nix +++ b/pkgs/by-name/me/meshlab/package.nix @@ -121,8 +121,11 @@ stdenv.mkDerivation (finalAttrs: { postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin,lib} mv $out/meshlab.app $out/Applications/ - ln $out/Applications/meshlab.app/Contents/Frameworks/libmeshlab-common.dylib $out/lib/ + ln $out/Applications/meshlab.app/Contents/Frameworks/libmeshlab-common{,-gui}.dylib $out/lib/ makeWrapper $out/{Applications/meshlab.app/Contents/MacOS,bin}/meshlab + substituteInPlace $out/lib/cmake/meshlab/meshlabTargets-release.cmake --replace-fail \ + "{_IMPORT_PREFIX}/meshlab.app" \ + "{_IMPORT_PREFIX}/Applications/meshlab.app" ''; # The hook will wrap all the plugin binaries, make they are not a diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bd88d03adfb..dba71cd83e1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11741,7 +11741,6 @@ with pkgs; meshlab = callPackage ../by-name/me/meshlab/package.nix { stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv; - llvmPackages = llvmPackages_18; }; meshlab-unstable = callPackage ../by-name/me/meshlab-unstable/package.nix {