From 92b62e73530a19e6fd09d663984a4b064e5b4d5f Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Mon, 6 Dec 2021 22:59:45 +0000 Subject: [PATCH] grass: Add pdal dep and missing feature flags This is used for processing lidar point clouds. --- pkgs/applications/gis/grass/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 842772ed31b8..87f5686d019c 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python3Packages, libLAS, proj-datumgrid -, zstd +, zstd, pdal }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas - libLAS proj-datumgrid zstd ] + libLAS proj-datumgrid zstd pdal ] ++ (with python3Packages; [ python python-dateutil wxPython_4_1 numpy ]); # On Darwin the installer tries to symlink the help files into a system @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { "--with-readline" "--with-wxwidgets" "--with-netcdf" + "--with-pdal" "--with-geos" "--with-postgres" "--with-postgres-libs=${postgresql.lib}/lib/" @@ -47,6 +48,9 @@ stdenv.mkDerivation rec { "--with-mysql-libs=${libmysqlclient}/lib/mysql" "--with-blas" "--with-liblas=${libLAS}/bin/liblas-config" + "--with-zstd" + "--with-fftw" + "--with-pthread" ]; # Otherwise a very confusing "Can't load GDAL library" error