alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #185461 from tpwrules/update-cloudcompare

Browse source 
cloudcompare: 2.12.1 -> 2.12.4
This commit is contained in:
Jonas Heinrich 2022-08-21 20:59:14 +02:00 committed by GitHub
parent f95d0b966e 495266d3d0
commit 403e4245c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,13 +23,13 @@
mkDerivation rec {
pname = "cloudcompare";
version = "2.12.1";
version = "2.12.4";
src = fetchFromGitHub {
owner = "CloudCompare";
repo = "CloudCompare";
rev = "v${version}";
sha256 = "sha256-gX07Km+DNnsz5eDAC2RueMHjmIfQvgGnNOujZ/yM/vE=";
sha256 = "sha256-rQ9/vS/fyRWGBL4UGPNSeeNsDtnRHEp9NCViBtu/QEs=";
fetchSubmodules = true;
};

89
pkgs/development/libraries/pdal/2_3.nix
View file

@ -1,89 +0,0 @@
{ 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;
};
}

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

@ -15798,9 +15798,7 @@ with pkgs;
cloud-nuke = callPackage ../development/tools/cloud-nuke { };
cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare {
pdal = pdal_2_3;
};
cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { };
cloudflare-warp = callPackage ../tools/networking/cloudflare-warp { };
@ -20738,8 +20736,6 @@ 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 { };