diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
commit | f8a8fc6c7c079de430fa528f688ddac781bcef16 (patch) | |
tree | 08c4f42540499cdac0331e8727cde16baabd08f4 /pkgs/applications/gis/grass | |
parent | 6be720b3a756662bb31adfdc1948553a02057c16 (diff) |
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1. Let's delay this. We have some serious regressions.
Diffstat (limited to 'pkgs/applications/gis/grass')
-rw-r--r-- | pkgs/applications/gis/grass/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 562a5e616a324..360d94d1b8250 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas -, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid +, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS, proj-datumgrid }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj - readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas + readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas libLAS proj-datumgrid ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { "--with-postgres-libs=${postgresql.lib}/lib/" # it complains about missing libmysqld but doesn't really seem to need it "--with-mysql" - "--with-mysql-includes=${libmysqlclient}/include/mysql" - "--with-mysql-libs=${libmysqlclient}/lib/mysql" + "--with-mysql-includes=${mysql.connector-c}/include/mysql" + "--with-mysql-libs=${mysql.connector-c}/lib/mysql" "--with-blas" "--with-liblas=${libLAS}/bin/liblas-config" ]; |