public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LASzip, LASzip2: Rename LASzip -> LASzip2, add LASzip 3.

Browse Source 
We have to keep the old one because libLAS does not support LASzip 3,
see https://github.com/libLAS/libLAS/issues/144.
This commit is contained in:
Niklas Hambüchen 2020-06-25 20:54:27 +02:00
parent 75c7f58507
commit 0866700e3b
4 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/LASzip/LASzip2.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
version = "2.2.0";
pname = "LASzip";
src = fetchurl {
url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz";
sha256 = "b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2";
};
buildInputs = [cmake];
meta = {
description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
homepage = https://laszip.org;
license = stdenv.lib.licenses.lgpl2;
maintainers = [ stdenv.lib.maintainers.michelk ];
platforms = stdenv.lib.platforms.unix;
};
}

16
pkgs/development/libraries/LASzip/default.nix
View File

@ -1,15 +1,19 @@
{ stdenv, fetchurl, cmake }: { stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.2.0"; version = "3.4.3";
pname = "LASzip"; pname = "LASzip";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz"; owner = "LASzip";
sha256 = "b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2"; repo = "LASzip";
rev = version;
sha256 = "09lcsgxwv0jq50fhsgfhx0npbf1zcwn3hbnq6q78fshqksbxmz7m";
}; };
buildInputs = [cmake]; nativeBuildInputs = [
cmake
];
meta = { meta = {
description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; description = "Turn quickly bulky LAS files into compact LAZ files without information loss";

8
pkgs/development/libraries/libLAS/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip, fixDarwinDylibNames }: { stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libLAS-1.8.1"; name = "libLAS-1.8.1";
@ -9,13 +9,15 @@ stdenv.mkDerivation rec {
sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws";
}; };
buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip ] buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
cmakeFlags = [ cmakeFlags = [
"-DGDAL_CONFIG=${gdal}/bin/gdal-config" "-DGDAL_CONFIG=${gdal}/bin/gdal-config"
"-DWITH_LASZIP=ON" "-DWITH_LASZIP=ON"
"-DLASZIP_INCLUDE_DIR=${LASzip}/include" # libLAS is currently not compatible with LASzip 3,
# see https://github.com/libLAS/libLAS/issues/144.
"-DLASZIP_INCLUDE_DIR=${LASzip2}/include"
"-DCMAKE_EXE_LINKER_FLAGS=-pthread" "-DCMAKE_EXE_LINKER_FLAGS=-pthread"
]; ];

1
pkgs/top-level/all-packages.nix
View File

@ -12612,6 +12612,7 @@ in
lasso = callPackage ../development/libraries/lasso { }; lasso = callPackage ../development/libraries/lasso { };
LASzip = callPackage ../development/libraries/LASzip { }; LASzip = callPackage ../development/libraries/LASzip { };
LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { };
lcms = lcms1; lcms = lcms1;