From 175331f0f30e2d08afafc890b2b07568e19da609 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Tue, 17 Oct 2023 17:03:49 -0500 Subject: [PATCH] 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. --- pkgs/development/libraries/libLAS/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index fc55f14f118e..7f2c12a9dea2 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.