cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #101879 from sikmir/cloudcompare

Browse source 
cloudcompare: 2.11.0 → 2.11.2
This commit is contained in:
Niklas Hambüchen 2020-10-28 13:43:31 +01:00 committed by GitHub
commit c06f86d591
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/graphics/cloudcompare/default.nix
View file

@ -18,17 +18,17 @@
mkDerivation rec {
pname = "cloudcompare";
version = "2.11.0";
version = "2.11.2";
src = fetchFromGitHub {
owner = "CloudCompare";
repo = "CloudCompare";
rev = "v${version}";
sha256 = "02ahhhivgb9k1aygw1m35wdvhaizag1r98mb0r6zzrs5p4y64wlb";
sha256 = "0sb2h08iaf6zrf54sg6ql6wm63q5vq0kpd3gffdm26z8w6j6wv3s";
# As of writing includes (https://github.com/CloudCompare/CloudCompare/blob/a1c589c006fc325e8b560c77340809b9c7e7247a/.gitmodules):
# * libE57Format
# * PoissonRecon
# In > 2.11 it will also contain
# In a future version it will also contain
# * CCCoreLib
fetchSubmodules = true;
};
@ -53,7 +53,7 @@ mkDerivation rec {
];
cmakeFlags = [
# TODO: This will become -DCCCORELIB_USE_TBB=ON in > 2.11.0, see
# TODO: This will become -DCCCORELIB_USE_TBB=ON in a future version, see
# https://github.com/CloudCompare/CloudCompare/commit/f5a0c9fd788da26450f3fa488b2cf0e4a08d255f
"-DCOMPILE_CC_CORE_LIB_WITH_TBB=ON"
"-DOPTION_USE_DXF_LIB=ON"