BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cloudcompare: 2.12.0 -> 2.12.1, fix build

Browse source 
Fixes build by using PDAL 2.3.0 as there are problems with 2.4.0.
This commit is contained in:
Thomas Watson 2022-05-20 17:34:05 -05:00
parent 2f13626ac5
commit 4c711c386a
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -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 { };