Merge pull request #156828 from willcohen/grass-darwin

authored by

Sandro and committed by
GitHub
90087b35 5a673e35

+16 -7
+16 -7
pkgs/applications/gis/grass/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw 2 - , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas 2 + , cairo, readline, ffmpeg, makeWrapper, wxGTK30, wxmac, netcdf, blas 3 3 , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python3Packages, libLAS, proj-datumgrid 4 4 , zstd, pdal, wrapGAppsHook 5 5 }: ··· 16 16 }; 17 17 18 18 nativeBuildInputs = [ pkg-config ]; 19 - buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo 20 - readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas 21 - libLAS proj-datumgrid zstd pdal wrapGAppsHook ] 22 - ++ (with python3Packages; [ python python-dateutil wxPython_4_1 numpy ]); 19 + buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite 20 + readline ffmpeg makeWrapper netcdf geos postgresql libmysqlclient blas 21 + libLAS proj-datumgrid zstd wrapGAppsHook ] 22 + ++ lib.optionals stdenv.isLinux [ cairo pdal wxGTK30 ] 23 + ++ lib.optional stdenv.isDarwin wxmac 24 + ++ (with python3Packages; [ python python-dateutil numpy ] 25 + ++ lib.optional stdenv.isDarwin wxPython_4_0 26 + ++ lib.optional stdenv.isLinux wxPython_4_1); 23 27 24 28 # On Darwin the installer tries to symlink the help files into a system 25 29 # directory ··· 33 37 configureFlags = [ 34 38 "--with-proj-share=${proj}/share/proj" 35 39 "--with-proj-includes=${proj.dev}/include" 36 - "--with-proj-lib=${proj}/lib" 40 + "--with-proj-libs=${proj}/lib" 37 41 "--without-opengl" 38 42 "--with-readline" 39 43 "--with-wxwidgets" 40 44 "--with-netcdf" 41 - "--with-pdal" 42 45 "--with-geos" 43 46 "--with-postgres" 44 47 "--with-postgres-libs=${postgresql.lib}/lib/" ··· 51 54 "--with-zstd" 52 55 "--with-fftw" 53 56 "--with-pthread" 57 + ] ++ lib.optionals stdenv.isLinux [ 58 + "--with-pdal" 59 + ] ++ lib.optionals stdenv.isDarwin [ 60 + "--without-cairo" 61 + "--without-freetype" 62 + "--without-x" 54 63 ]; 55 64 56 65 # Otherwise a very confusing "Can't load GDAL library" error