gdal: Clean up formatting

This commit is contained in:
brano543 2020-02-15 13:05:56 +01:00
parent 74e9b1753d
commit 175d83634b

View File

@ -1,9 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib { stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql
, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl , libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl, libpng
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat, libiconv, libxml2
, libiconv, libxml2, autoreconfHook , autoreconfHook, netcdfSupport ? true, netcdf, hdf5, curl }:
, netcdfSupport ? true, netcdf, hdf5, curl
}:
with stdenv.lib; with stdenv.lib;
@ -22,9 +20,23 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite buildInputs = [
libspatialite libgeotiff poppler hdf4 qhull giflib expat libxml2 ] unzip
++ (with pythonPackages; [ python numpy wrapPython ]) libjpeg
libtiff
libpng
proj
openssl
sqlite
libspatialite
libgeotiff
poppler
hdf4
qhull
giflib
expat
libxml2
] ++ (with pythonPackages; [ python numpy wrapPython ])
++ stdenv.lib.optional stdenv.isDarwin libiconv ++ stdenv.lib.optional stdenv.isDarwin libiconv
++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
@ -72,7 +84,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Translator library for raster geospatial data formats"; description = "Translator library for raster geospatial data formats";
homepage = https://www.gdal.org/; homepage = "https://www.gdal.org/";
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.marcweber ]; maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = with stdenv.lib.platforms; linux ++ darwin; platforms = with stdenv.lib.platforms; linux ++ darwin;