Merge pull request #173821 from tpwrules/fix-cloudcompare-build
cloudcompare: 2.12.0 -> 2.12.1, fix build
This commit is contained in:
commit
505ffa2ffc
|
@ -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
|
||||
};
|
||||
}
|
||||
|
|
89
pkgs/development/libraries/pdal/2_3.nix
Normal file
89
pkgs/development/libraries/pdal/2_3.nix
Normal file
|
@ -0,0 +1,89 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, openscenegraph
|
||||
, curl
|
||||
, gdal
|
||||
, hdf5-cpp
|
||||
, LASzip
|
||||
, libe57format
|
||||
, libgeotiff
|
||||
, libxml2
|
||||
, postgresql
|
||||
, tiledb
|
||||
, xercesc
|
||||
, zlib
|
||||
, zstd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdal";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PDAL";
|
||||
repo = "PDAL";
|
||||
rev = version;
|
||||
sha256 = "sha256-DKIraCyp8fcgnVp5dFrtQ4Wq96cQGC9SiAPLS6htUZc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with GCC 11
|
||||
(fetchpatch {
|
||||
url = "https://github.com/PDAL/PDAL/commit/47e1eb2dc884d1b8c5caa8e3b48ef90f4f12c68d.patch";
|
||||
hash = "sha256-Ls2LkVpbwQAMt2Iuq0zq9D9l2eyP8m1IO3poCnbxGDU=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openscenegraph
|
||||
curl
|
||||
gdal
|
||||
hdf5-cpp
|
||||
LASzip
|
||||
libe57format
|
||||
libgeotiff
|
||||
libxml2
|
||||
postgresql
|
||||
tiledb
|
||||
xercesc
|
||||
zlib
|
||||
zstd
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_PLUGIN_E57=ON"
|
||||
"-DBUILD_PLUGIN_HDF=ON"
|
||||
"-DBUILD_PLUGIN_PGPOINTCLOUD=ON"
|
||||
"-DBUILD_PLUGIN_TILEDB=ON"
|
||||
|
||||
# Plugins can probably not be made work easily:
|
||||
"-DBUILD_PLUGIN_CPD=OFF"
|
||||
"-DBUILD_PLUGIN_FBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs
|
||||
"-DBUILD_PLUGIN_GEOWAVE=OFF"
|
||||
"-DBUILD_PLUGIN_I3S=OFF"
|
||||
"-DBUILD_PLUGIN_ICEBRIDGE=OFF"
|
||||
"-DBUILD_PLUGIN_MATLAB=OFF"
|
||||
"-DBUILD_PLUGIN_MBIO=OFF"
|
||||
"-DBUILD_PLUGIN_MRSID=OFF"
|
||||
"-DBUILD_PLUGIN_NITF=OFF"
|
||||
"-DBUILD_PLUGIN_OCI=OFF"
|
||||
"-DBUILD_PLUGIN_RDBLIB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs
|
||||
"-DBUILD_PLUGIN_RIVLIB=OFF"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data";
|
||||
homepage = "https://pdal.io";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ nh2 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
|
@ -15181,7 +15181,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 { };
|
||||
|
||||
|
@ -20034,6 +20036,8 @@ with pkgs;
|
|||
|
||||
pdal = callPackage ../development/libraries/pdal { } ;
|
||||
|
||||
pdal_2_3 = callPackage ../development/libraries/pdal/2_3.nix { } ;
|
||||
|
||||
pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
|
||||
|
||||
pe-parse = callPackage ../development/libraries/pe-parse { };
|
||||
|
|
Loading…
Reference in a new issue