nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdal: Fix finding postgresql after 3.0 update

Browse Source
This commit is contained in:
brano543 2020-02-15 13:09:14 +01:00
parent 175d83634b
commit b57af2d024
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/gdal/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql { stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql
, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl, libpng , libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl, libpng
, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat, libiconv, libxml2 , sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat, libiconv, libxml2
, autoreconfHook, netcdfSupport ? true, netcdf, hdf5, curl }: , autoreconfHook, netcdfSupport ? true, netcdf, hdf5, curl, pkg-config }:
with stdenv.lib; with stdenv.lib;
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sourceRoot = "source/gdal"; sourceRoot = "source/gdal";
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ buildInputs = [
unzip unzip
@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
giflib giflib
expat expat
libxml2 libxml2
postgresql
] ++ (with pythonPackages; [ python numpy wrapPython ]) ] ++ (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 ];
@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
"--with-png=${libpng.dev}" # optional "--with-png=${libpng.dev}" # optional
"--with-poppler=${poppler.dev}" # optional "--with-poppler=${poppler.dev}" # optional
"--with-libz=${zlib.dev}" # optional "--with-libz=${zlib.dev}" # optional
"--with-pg=${postgresql}/bin/pg_config" "--with-pg=yes" # since gdal 3.0 doesn't use ${postgresql}/bin/pg_config
"--with-mysql=${libmysqlclient}/bin/mysql_config" "--with-mysql=${libmysqlclient}/bin/mysql_config"
"--with-geotiff=${libgeotiff}" "--with-geotiff=${libgeotiff}"
"--with-sqlite3=${sqlite.dev}" "--with-sqlite3=${sqlite.dev}"