diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-01-01 19:56:33 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-01 19:56:33 +0800 |
| commit | 031376dbb9c66fd15eb6032bab025e834a4dad51 (patch) | |
| tree | b39166a84847bb75f7f76f18b61d4843cfe69a1c /pkgs/applications/graphics | |
| parent | b47b401e65074d469bae1c9f754d4213f1b666c4 (diff) | |
| parent | 7c0942ba57f5dc855ce062af7cac07428f9bf94c (diff) | |
Merge pull request #148857 from vs49688/meshlab
meshlab: 2020.12 -> 2021.10
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/meshlab/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 8633494a4ca46..dcdfd364b5a8f 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -14,17 +14,21 @@ , levmar , qhull , cmake +, cgal_5 +, boost17x +, mpfr +, xercesc }: mkDerivation rec { pname = "meshlab"; - version = "2020.12"; + version = "2021.10"; src = fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "meshlab"; rev = "Meshlab-${version}"; - sha256 = "QrnqXEVqI1ADUYWalZ0h/0+xS+gDZTinm0weT39onw0="; + sha256 = "14rrd8qrf91k89y6w2mn1r9zcfnwd0mir6g4dlgvr04i77hj4lk4"; fetchSubmodules = true; # for vcglib }; @@ -41,6 +45,10 @@ mkDerivation rec { gmp levmar qhull + cgal_5 + boost17x + mpfr + xercesc ]; nativeBuildInputs = [ cmake ]; @@ -61,6 +69,7 @@ mkDerivation rec { # disable when available in nixpkgs "-DALLOW_BUNDLED_OPENCTM=ON" "-DALLOW_BUNDLED_SSYNTH=ON" + "-DALLOW_BUNDLED_BOOST=OFF" # some plugins are disabled unless these are on "-DALLOW_BUNDLED_NEWUOA=ON" "-DALLOW_BUNDLED_LEVMAR=ON" |