diff options
author | Izorkin <izorkin@elven.pw> | 2019-08-17 21:24:29 +0300 |
---|---|---|
committer | Izorkin <izorkin@elven.pw> | 2019-09-09 15:55:34 +0300 |
commit | 329a88efa78126ae7413807ce58000eab49e82d9 (patch) | |
tree | 432995643b4784e5eefdd253ace54a2566eebd7c /pkgs/applications/gis/grass | |
parent | cfb909229dd4c82441ddbf6d904def2057b62678 (diff) | |
download | nixpkgs-329a88efa78126ae7413807ce58000eab49e82d9.tar nixpkgs-329a88efa78126ae7413807ce58000eab49e82d9.tar.gz nixpkgs-329a88efa78126ae7413807ce58000eab49e82d9.tar.bz2 nixpkgs-329a88efa78126ae7413807ce58000eab49e82d9.tar.lz nixpkgs-329a88efa78126ae7413807ce58000eab49e82d9.tar.xz nixpkgs-329a88efa78126ae7413807ce58000eab49e82d9.tar.zst nixpkgs-329a88efa78126ae7413807ce58000eab49e82d9.zip |
treewide: replace mysql.connector-c to libmysqlclient
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 360d94d1b82..562a5e616a3 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, mysql, python2Packages, libLAS, proj-datumgrid +, proj, gdal, geos, sqlite, postgresql, libmysqlclient, 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 mysql.connector-c blas + readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient 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=${mysql.connector-c}/include/mysql" - "--with-mysql-libs=${mysql.connector-c}/lib/mysql" + "--with-mysql-includes=${libmysqlclient}/include/mysql" + "--with-mysql-libs=${libmysqlclient}/lib/mysql" "--with-blas" "--with-liblas=${libLAS}/bin/liblas-config" ]; |