meshlab: 2022.02 -> 2023.12

authored by Guilhem Saurel and committed by Sandro Jäckel 74900367 e71d969c

+32 -26
+32 -26
pkgs/applications/graphics/meshlab/default.nix
··· 15 15 , qhull 16 16 , cmake 17 17 , cgal 18 - , boost179 18 + , boost 19 19 , mpfr 20 20 , xercesc 21 + , tbb 22 + , embree 23 + , vcg 24 + , libigl 25 + , corto 26 + , openctm 27 + , structuresynth 21 28 }: 22 29 23 30 mkDerivation rec { 24 31 pname = "meshlab"; 25 - version = "2022.02"; 32 + version = "2023.12"; 26 33 27 34 src = fetchFromGitHub { 28 35 owner = "cnr-isti-vclab"; 29 36 repo = "meshlab"; 30 37 rev = "MeshLab-${version}"; 31 - sha256 = "sha256-jcc3PfsiIeYyipteZgzd0NwZgFFgR/mMBiaInzhOcDY="; 32 - fetchSubmodules = true; # for vcglib 38 + sha256 = "sha256-AdUAWS741RQclYaSE3Tz1/I0YSinNAnfSaqef+Tib8Y="; 33 39 }; 34 40 35 41 buildInputs = [ ··· 46 52 levmar 47 53 qhull 48 54 cgal 49 - boost179 55 + boost 50 56 mpfr 51 57 xercesc 58 + tbb 59 + embree 60 + vcg 61 + libigl 62 + corto 63 + openctm 64 + structuresynth 52 65 ]; 53 66 54 67 nativeBuildInputs = [ cmake ]; 55 68 56 69 preConfigure = '' 57 - substituteAll ${./meshlab.desktop} scripts/Linux/resources/meshlab.desktop 58 - cmakeDir=$PWD/src 59 - mkdir ../build 60 - cd ../build 70 + substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop 71 + substituteInPlace src/external/libigl.cmake \ 72 + --replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-2.4.0 ${libigl} 73 + substituteInPlace src/external/nexus.cmake \ 74 + --replace-fail '$'{NEXUS_DIR}/src/corto ${corto.src} 75 + substituteInPlace src/external/levmar.cmake \ 76 + --replace-fail '$'{LEVMAR_LINK} ${levmar.src} \ 77 + --replace-warn "MD5 ''${LEVMAR_MD5}" "" 78 + substituteInPlace src/external/ssynth.cmake \ 79 + --replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \ 80 + --replace-warn "MD5 ''${SSYNTH_MD5}" "" 81 + substituteInPlace src/common_gui/CMakeLists.txt \ 82 + --replace-warn "MESHLAB_LIB_INSTALL_DIR" "CMAKE_INSTALL_LIBDIR" 61 83 ''; 62 84 63 85 cmakeFlags = [ 64 - "-DALLOW_BUNDLED_EIGEN=OFF" 65 - "-DALLOW_BUNDLED_GLEW=OFF" 66 - "-DALLOW_BUNDLED_LIB3DS=OFF" 67 - "-DALLOW_BUNDLED_MUPARSER=OFF" 68 - "-DALLOW_BUNDLED_QHULL=OFF" 69 - # disable when available in nixpkgs 70 - "-DALLOW_BUNDLED_OPENCTM=ON" 71 - "-DALLOW_BUNDLED_SSYNTH=ON" 72 - "-DALLOW_BUNDLED_BOOST=OFF" 73 - # some plugins are disabled unless these are on 74 - "-DALLOW_BUNDLED_NEWUOA=ON" 75 - "-DALLOW_BUNDLED_LEVMAR=ON" 76 - ]; 77 - 78 - CXXFLAGS = [ 79 - # GCC 13: error: 'int16_t' has not been declared in 'std' 80 - "-include cstdint" 86 + "-DVCGDIR=${vcg.src}" 81 87 ]; 82 88 83 89 postFixup = ''