diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
| commit | 22a216849bf82ec65e3de86b7ea30e9c6b11efa4 (patch) | |
| tree | 8b425b2c80cb46a8f7a8d72beeb66777506d7bd6 /pkgs/development/libraries/gdal | |
| parent | 415b29939b01ca13f4667d5ffa8ede8ed262b0ee (diff) | |
| download | nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.gz nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.bz2 nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.lz nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.xz nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.zst nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.zip | |
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c079de430fa528f688ddac781bcef16.
Diffstat (limited to 'pkgs/development/libraries/gdal')
| -rw-r--r-- | pkgs/development/libraries/gdal/2.4.0.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix index baf847d4e0a..d41b4c55f86 100644 --- a/pkgs/development/libraries/gdal/2.4.0.nix +++ b/pkgs/development/libraries/gdal/2.4.0.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl +, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv, libxml2 , netcdfSupport ? true, netcdf, hdf5, curl @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "--with-poppler=${poppler.dev}" # optional "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config" + "--with-mysql=${libmysqlclient}/bin/mysql_config" "--with-geotiff=${libgeotiff.dev}" "--with-sqlite3=${sqlite.dev}" "--with-spatialite=${libspatialite}" diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 413d4e19dde..bb53277075f 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl +, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv, libxml2, autoreconfHook , netcdfSupport ? true, netcdf, hdf5, curl @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "--with-poppler=${poppler.dev}" # optional "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config" + "--with-mysql=${libmysqlclient}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-sqlite3=${sqlite.dev}" "--with-spatialite=${libspatialite}" |