diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index 1d5556b6a8b..acbf572cb41 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -2,7 +2,6 @@ , stdenv , mkDerivation , fetchFromGitHub -, fetchpatch , cmake , boost , cgal_5 @@ -24,24 +23,16 @@ mkDerivation rec { pname = "cloudcompare"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "CloudCompare"; repo = "CloudCompare"; rev = "v${version}"; - sha256 = "sha256-hu3ckVocExi9lvxelHAwKb/MZacH4CcCE+vIzElgP/A="; + sha256 = "sha256-gX07Km+DNnsz5eDAC2RueMHjmIfQvgGnNOujZ/yM/vE="; fetchSubmodules = true; }; - patches = [ - # fix issues compiling on aarch64. remove once upgraded past 2.12.0 - (fetchpatch { - url = "https://github.com/CloudCompare/CloudCompare/commit/7e71861fdbd6ea704add5ba69343f47d8fc3d5ae.patch"; - sha256 = "sha256-CRUPjxtKUbsqOyYsjKF+dRZ+E3rqrv5mS3ZaOay2wk8="; - }) - ]; - nativeBuildInputs = [ cmake eigen # header-only @@ -115,6 +106,5 @@ mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ nh2 ]; platforms = with platforms; linux; # only tested here; might work on others - broken = stdenv.isLinux; # plugins/core/IO/qPDALIO/CMakeFiles/QPDAL_IO_PLUGIN.dir/src/LASFilter.cpp.o] Error 1 }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ca4a0384a4..6597b29fecd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15174,7 +15174,9 @@ with pkgs; cloud-nuke = callPackage ../development/tools/cloud-nuke { }; - cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare {}; + cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { + pdal = pdal_2_3; + }; cloudflare-warp = callPackage ../tools/networking/cloudflare-warp { };