diff options
| author | Thomas Watson <twatson52@icloud.com> | 2023-10-17 17:03:49 -0500 |
|---|---|---|
| committer | Thomas Watson <twatson52@icloud.com> | 2023-10-17 17:17:11 -0500 |
| commit | 175331f0f30e2d08afafc890b2b07568e19da609 (patch) | |
| tree | cd89439656abd36ff4f5f2c398946ad833611b79 | |
| parent | 019abf2a7de52aaa5e6288c20939656e1f415ac8 (diff) | |
| download | nixpkgs-175331f0f30e2d08afafc890b2b07568e19da609.tar nixpkgs-175331f0f30e2d08afafc890b2b07568e19da609.tar.gz nixpkgs-175331f0f30e2d08afafc890b2b07568e19da609.tar.bz2 nixpkgs-175331f0f30e2d08afafc890b2b07568e19da609.tar.lz nixpkgs-175331f0f30e2d08afafc890b2b07568e19da609.tar.xz nixpkgs-175331f0f30e2d08afafc890b2b07568e19da609.tar.zst nixpkgs-175331f0f30e2d08afafc890b2b07568e19da609.zip | |
libLAS: remove never-used and broken GDAL support
GDAL support was never compiled in because "WITH_GDAL=ON" was never defined in cmakeFlags. Defining that breaks compilation because libLAS is thorougly incompatible with modern GDAL. Remove GDAL as an input entirely to shrink dependency graph and tidy up.
| -rw-r--r-- | pkgs/development/libraries/libLAS/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index fc55f14f118..7f2c12a9dea 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libLAS"; @@ -28,10 +28,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ]; + buildInputs = [ boost libgeotiff libtiff LASzip2 ]; cmakeFlags = [ - "-DGDAL_CONFIG=${gdal}/bin/gdal-config" "-DWITH_LASZIP=ON" # libLAS is currently not compatible with LASzip 3, # see https://github.com/libLAS/libLAS/issues/144. |