diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-07-02 17:14:53 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-07-02 17:14:53 +0200 |
| commit | c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d (patch) | |
| tree | d1a10ef8a3e8fe00ac12ac1437ec46a856521084 /pkgs/development/libraries/libLAS/default.nix | |
| parent | 798c2d8bc1e947eb26e249b326bfaba49a91b735 (diff) | |
| parent | 3ee58112693c11cd8157495e09714cf9ddb599b3 (diff) | |
| download | nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.gz nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.bz2 nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.lz nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.xz nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.zst nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/libLAS/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libLAS/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 818e2ad85b0..95569c0a813 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -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 { name = "libLAS-1.8.1"; @@ -9,13 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip ] + buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DGDAL_CONFIG=${gdal}/bin/gdal-config" "-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" ]; |