diff options
| author | Zane van Iperen <zane@zanevaniperen.com> | 2021-12-06 14:35:38 +1000 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-01-01 12:00:33 +0000 |
| commit | 1e16d4b65d2751dd4ff57c37cc549cff5037d95d (patch) | |
| tree | 4b0766bcc9ab66252f63736df0a2e99e7b159cd1 | |
| parent | Merge pull request #152940 from NixOS/backport-152594-to-release-21.11 (diff) | |
| download | nixpkgs-1e16d4b65d2751dd4ff57c37cc549cff5037d95d.tar.gz | |
meshlab: 2020.12 -> 2021.10
* De-vendors boost and xercesc
* Enables CGAL
(cherry picked from commit 7c0942ba57f5dc855ce062af7cac07428f9bf94c)
| -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 8633494a4ca4..dcdfd364b5a8 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" |