From 9802d5895f2a478ed910338ae961b2fa9ee797f3 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 21 Sep 2025 17:10:16 +0200 Subject: [PATCH] meshlab-unstable: drop --- .../me/meshlab-unstable/meshlab.desktop | 14 -- pkgs/by-name/me/meshlab-unstable/package.nix | 159 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 - 4 files changed, 1 insertion(+), 178 deletions(-) delete mode 100644 pkgs/by-name/me/meshlab-unstable/meshlab.desktop delete mode 100644 pkgs/by-name/me/meshlab-unstable/package.nix diff --git a/pkgs/by-name/me/meshlab-unstable/meshlab.desktop b/pkgs/by-name/me/meshlab-unstable/meshlab.desktop deleted file mode 100644 index aa8de186440d..000000000000 --- a/pkgs/by-name/me/meshlab-unstable/meshlab.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Name=MeshLab -Version=@version@ -Name[en_GB]=MeshLab -GenericName=Mesh processing -GenericName[en_GB]=Mesh processing -Comment=View and process meshes -Type=Application -Exec=@out@/bin/meshlab %U -TryExec=@out@/bin/meshlab -Icon=@out@/share/icons/hicolor/meshlab.png -Terminal=false -MimeType=model/mesh;application/x-3ds;image/x-3ds;model/x-ply;application/sla;model/x-quad-object;model/x-geomview-off;application/x-cyclone-ptx;application/x-vmi;application/x-bre;model/vnd.collada+xml;model/openctm;application/x-expe-binary;application/x-expe-ascii;application/x-xyz;application/x-gts;chemical/x-pdb;application/x-tri;application/x-asc;model/x3d+xml;model/x3d+vrml;model/vrml;model/u3d;model/idtf; -Categories=Graphics;3DGraphics;Viewer;Qt; diff --git a/pkgs/by-name/me/meshlab-unstable/package.nix b/pkgs/by-name/me/meshlab-unstable/package.nix deleted file mode 100644 index 00468e6a0801..000000000000 --- a/pkgs/by-name/me/meshlab-unstable/package.nix +++ /dev/null @@ -1,159 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - llvmPackages, - libsForQt5, - libGLU, - lib3ds, - bzip2, - muparser, - eigen, - glew, - gmp, - levmar, - qhull, - cmake, - cgal, - boost, - mpfr, - xercesc, - onetbb, - embree, - libigl, - corto, - openctm, - structuresynth, -}: - -let - tinygltf-src = fetchFromGitHub { - owner = "syoyo"; - repo = "tinygltf"; - tag = "v2.6.3"; - hash = "sha256-IyezvHzgLRyc3z8HdNsQMqDEhP+Ytw0stFNak3C8lTo="; - }; - - # requires submodules to build - lib3mf-src = fetchFromGitHub { - owner = "3MFConsortium"; - repo = "lib3mf"; - tag = "v2.3.2"; - fetchSubmodules = true; - hash = "sha256-pKjnN9H6/A2zPvzpFed65J+mnNwG/dkSE2/pW7IlN58="; - }; -in -stdenv.mkDerivation { - pname = "meshlab-unstable"; - version = "2023.12-unstable-2025-02-21"; - - src = fetchFromGitHub { - owner = "cnr-isti-vclab"; - repo = "meshlab"; - # note that this is in branch devel - rev = "72142583980b6dbfc5b85c6cca226a72f48497a9"; - hash = "sha256-ev6b8sgJsjvD8KMBbC6kbrVvTxTxpqsXu/sK1Ih6+OA="; - # needed for an updated version of vcg in their submodule - fetchSubmodules = true; - }; - - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace src/meshlab/CMakeLists.txt \ - --replace-fail "set_additional_settings_info_plist(" "# set_additional_settings_info_plist(" \ - --replace-fail " TARGET meshlab" "# TARGET meshlab" \ - --replace-fail " FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)" \ - "# FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)" - ''; - - buildInputs = [ - libGLU - libsForQt5.qtbase - libsForQt5.qtscript - libsForQt5.qtxmlpatterns - lib3ds - bzip2 - muparser - eigen - glew - gmp - levmar - qhull - cgal - boost - mpfr - xercesc - onetbb - embree - libigl - corto - openctm - structuresynth - ] - ++ lib.optionals stdenv.cc.isClang [ - llvmPackages.openmp - ]; - - nativeBuildInputs = [ - cmake - libsForQt5.wrapQtAppsHook - ]; - - preConfigure = '' - mkdir src/external/downloads - cp -r --no-preserve=mode,ownership ${lib3mf-src} src/external/downloads/lib3mf-2.3.2 - - substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop - substituteInPlace src/external/tinygltf.cmake \ - --replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/tinygltf-2.6.3 ${tinygltf-src} - substituteInPlace src/external/libigl.cmake \ - --replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-'$'{LIBIGL_VER} ${libigl} - substituteInPlace src/external/nexus.cmake \ - --replace-fail '$'{NEXUS_DIR}/src/corto ${corto.src} - substituteInPlace src/external/levmar.cmake \ - --replace-fail '$'{LEVMAR_LINK} ${levmar.src} \ - --replace-warn "MD5 ''${LEVMAR_MD5}" "" - substituteInPlace src/external/ssynth.cmake \ - --replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \ - --replace-warn "MD5 ''${SSYNTH_MD5}" "" - substituteInPlace src/common_gui/CMakeLists.txt \ - --replace-warn "MESHLAB_LIB_INSTALL_DIR" "CMAKE_INSTALL_LIBDIR" - ''; - - 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/* $out/lib/ - makeWrapper $out/{Applications/meshlab.app/Contents/MacOS,bin}/meshlab - ''; - - postFixup = - lib.optionalString stdenv.hostPlatform.isLinux '' - patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped - patchelf --add-needed $out/lib/meshlab/lib3mf.so $out/lib/meshlab/plugins/libio_3mf.so - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - wrapQtApp "$out/Applications/meshlab.app/Contents/MacOS/meshlab" - install_name_tool -change libopenctm.dylib "${lib.getOutput "out" openctm}/lib/libopenctm.dylib" \ - "$out/Applications/meshlab.app/Contents/PlugIns/libio_ctm.so" - ''; - - # The hook will wrap all the plugin binaries, make they are not a - # valid plugin. So we have to wrap the main app manually. - # See: https://github.com/NixOS/nixpkgs/pull/396295#issuecomment-3137779781 - dontWrapQtApps = stdenv.hostPlatform.isDarwin; - - # display a black screen on wayland, so force XWayland for now. - # Might be fixed when upstream will be ready for Qt6. - qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ - "--set QT_QPA_PLATFORM xcb" - ]; - - meta = { - description = "System for processing and editing 3D triangular meshes (unstable)"; - mainProgram = "meshlab"; - homepage = "https://www.meshlab.net/"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ pca006132 ]; - platforms = with lib.platforms; linux ++ darwin; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a2fe24a88240..df6f2d939979 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -979,6 +979,7 @@ mapAliases { mediastreamer-openh264 = throw "'mediastreamer-openh264' has been moved to 'linphonePackages.msopenh264'"; # Added 2025-09-20 meilisearch_1_11 = throw "'meilisearch_1_11' has been removed, as it is no longer supported"; # Added 2025-10-03 melmatcheq.lv2 = melmatcheq-lv2; # Added 2025-09-27 + meshlab-unstable = throw "meshlab-unstable has been removed, as it was behind meshlab"; # Added 2025-09-21 meteo = throw "'meteo' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09 microcodeAmd = throw "'microcodeAmd' has been renamed to/replaced by 'microcode-amd'"; # Converted to throw 2025-10-27 microcodeIntel = throw "'microcodeIntel' has been renamed to/replaced by 'microcode-intel'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dba71cd83e1c..f8714c6ef2d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11743,11 +11743,6 @@ with pkgs; stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv; }; - meshlab-unstable = callPackage ../by-name/me/meshlab-unstable/package.nix { - stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv; - llvmPackages = llvmPackages_18; - }; - meshcentral = callPackage ../tools/admin/meshcentral { }; michabo = libsForQt5.callPackage ../applications/misc/michabo { };