diff --git a/pkgs/by-name/li/libLAS/package.nix b/pkgs/by-name/li/libLAS/package.nix index 138f56e8391e..749125043f06 100644 --- a/pkgs/by-name/li/libLAS/package.nix +++ b/pkgs/by-name/li/libLAS/package.nix @@ -12,12 +12,12 @@ fixDarwinDylibNames, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libLAS"; version = "1.8.1"; src = fetchurl { - url = "https://download.osgeo.org/liblas/libLAS-${version}.tar.bz2"; + url = "https://download.osgeo.org/liblas/libLAS-${finalAttrs.version}.tar.bz2"; sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; @@ -44,41 +44,57 @@ stdenv.mkDerivation rec { url = "https://github.com/libLAS/libLAS/commit/e789d43df4500da0c12d2f6d3ac1d031ed835493.patch"; hash = "sha256-0zI0NvOt9C5BPrfAbgU1N1kj3rZFB7rf0KRj7yemyWI="; }) + (fetchpatch { + name = "set-macos-rpath-to-off-explicitly.patch"; + url = "https://github.com/libLAS/libLAS/commit/ce9bc0da9e5d1eb8527259854aa826df062ed18e.patch"; + hash = "sha256-Rse0p8bNgORNaw/EBbu0i2/iVmikFyeloJL8YkYarn0="; + }) + (fetchpatch { + name = "fix-findLASZIP.patch"; + url = "https://github.com/libLAS/libLAS/commit/be77a75f475ec8d59c0dae1c3c896289bcb5a287.patch"; + hash = "sha256-5XDexk3IW7s2/G27GXkWp7cw1WZyQLMk/lTpfOM6PM0="; + }) ]; # Disable setting of C++98 standard which was dropped in boost 1.84.0 postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail 'set(CMAKE_CXX_FLAGS "''${CMAKE_CXX_FLAGS} -std=c++98 -ansi")' '#' + '' + # Upstream libLAS still uses cmake_minimum_required(VERSION 2.8.11). + # This is not compatible with CMake 4, because support for CMake < 3.5 has been removed. + + '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'cmake_minimum_required(VERSION 2.6.0)' 'cmake_minimum_required(VERSION 3.10)' ''; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = [ boost libgeotiff libtiff + # libLAS is currently not compatible with LASzip 3, + # see https://github.com/libLAS/libLAS/issues/144. laszip_2 zlib ]; cmakeFlags = [ - "-DWITH_LASZIP=ON" - # libLAS is currently not compatible with LASzip 3, - # see https://github.com/libLAS/libLAS/issues/144. - "-DLASZIP_INCLUDE_DIR=${laszip_2}/include" - "-DCMAKE_EXE_LINKER_FLAGS=-pthread" + (lib.cmakeBool "WITH_LASZIP" true) + (lib.cmakeFeature "CMAKE_EXE_LINKER_FLAGS" "-pthread") ]; postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change "@rpath/liblas.3.dylib" "$out/lib/liblas.3.dylib" $out/lib/liblas_c.dylib ''; - meta = with lib; { + meta = { description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset"; homepage = "https://liblas.org"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ michelk ]; - teams = [ teams.geospatial ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ michelk ]; + teams = with lib.teams; [ geospatial ]; }; -} +})