grass: alphabetical reordering of dependencies

Code cleanup, no functional changes.

+68 -24
+68 -24
pkgs/applications/gis/grass/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw 2 - , cairo, readline, ffmpeg, makeWrapper, wxGTK32, libiconv, libxml2, netcdf, blas 3 - , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python3Packages, proj-datumgrid 4 - , zstd, pdal, wrapGAppsHook 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , makeWrapper 5 + , wrapGAppsHook 6 + 7 + , bison 8 + , blas 9 + , cairo 10 + , ffmpeg 11 + , fftw 12 + , flex 13 + , gdal 14 + , geos 15 + , libiconv 16 + , libmysqlclient 17 + , libpng 18 + , libtiff 19 + , libxml2 20 + , netcdf 21 + , pdal 22 + , pkg-config 23 + , postgresql 24 + , proj 25 + , proj-datumgrid 26 + , python3Packages 27 + , readline 28 + , sqlite 29 + , wxGTK32 30 + , zlib 31 + , zstd 5 32 }: 6 33 7 34 stdenv.mkDerivation rec { ··· 16 43 }; 17 44 18 45 nativeBuildInputs = [ 19 - pkg-config bison flex makeWrapper wrapGAppsHook 46 + makeWrapper 47 + wrapGAppsHook 48 + 49 + bison 50 + flex 20 51 gdal # for `gdal-config` 21 52 geos # for `geos-config` 53 + libmysqlclient # for `mysql_config` 22 54 netcdf # for `nc-config` 23 - libmysqlclient # for `mysql_config` 55 + pkg-config 24 56 ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]); 25 57 26 58 buildInputs = [ 27 - cairo zlib proj libtiff libpng libxml2 fftw sqlite 28 - readline ffmpeg postgresql blas wxGTK32 29 - proj-datumgrid zstd 59 + blas 60 + cairo 61 + ffmpeg 62 + fftw 30 63 gdal 31 64 geos 32 - netcdf 33 65 libmysqlclient 66 + libpng 67 + libtiff 68 + libxml2 69 + netcdf 34 70 pdal 71 + postgresql 72 + proj 73 + proj-datumgrid 74 + readline 75 + sqlite 76 + wxGTK32 77 + zlib 78 + zstd 35 79 ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; 36 80 37 81 strictDeps = true; ··· 46 90 ''; 47 91 48 92 configureFlags = [ 49 - "--with-proj-share=${proj}/share/proj" 50 - "--with-proj-includes=${proj.dev}/include" 51 - "--with-proj-libs=${proj}/lib" 52 - "--without-opengl" 53 - "--with-readline" 54 - "--with-wxwidgets" 55 - "--with-netcdf" 93 + "--with-blas" 94 + "--with-fftw" 56 95 "--with-geos" 57 - "--with-postgres" 58 - "--with-postgres-libs=${postgresql.lib}/lib/" 59 - # it complains about missing libmysqld but doesn't really seem to need it 96 + # It complains about missing libmysqld but doesn't really seem to need it 60 97 "--with-mysql" 61 98 "--with-mysql-includes=${lib.getDev libmysqlclient}/include/mysql" 62 99 "--with-mysql-libs=${libmysqlclient}/lib/mysql" 63 - "--with-blas" 64 - "--with-zstd" 65 - "--with-fftw" 100 + "--with-netcdf" 101 + "--with-postgres" 102 + "--with-postgres-libs=${postgresql.lib}/lib/" 103 + "--with-proj-includes=${proj.dev}/include" 104 + "--with-proj-libs=${proj}/lib" 105 + "--with-proj-share=${proj}/share/proj" 66 106 "--with-pthread" 107 + "--with-readline" 108 + "--with-wxwidgets" 109 + "--with-zstd" 110 + "--without-opengl" 67 111 ] ++ lib.optionals stdenv.isLinux [ 68 112 "--with-pdal" 69 113 ] ++ lib.optionals stdenv.isDarwin [ ··· 97 141 enableParallelBuilding = true; 98 142 99 143 meta = with lib; { 100 - homepage = "https://grass.osgeo.org/"; 101 144 description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; 145 + homepage = "https://grass.osgeo.org/"; 102 146 license = licenses.gpl2Plus; 103 147 maintainers = with maintainers; teams.geospatial.members ++ [ mpickering ]; 104 148 platforms = platforms.all;