diff options
| author | Robin Gloster <mail@glob.in> | 2017-07-09 17:43:03 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-12-29 02:18:35 +0100 |
| commit | ee1c85aee9ebbfc76c6fed31a868e4082e4bad13 (patch) | |
| tree | c5f1e90aa32da5c1502711f22845c8e22d1100c6 /pkgs/development/libraries | |
| parent | 9265012de647750d64e40c07bcc5ee6ccc56da6d (diff) | |
| download | nixpkgs-ee1c85aee9ebbfc76c6fed31a868e4082e4bad13.tar nixpkgs-ee1c85aee9ebbfc76c6fed31a868e4082e4bad13.tar.gz nixpkgs-ee1c85aee9ebbfc76c6fed31a868e4082e4bad13.tar.bz2 nixpkgs-ee1c85aee9ebbfc76c6fed31a868e4082e4bad13.tar.lz nixpkgs-ee1c85aee9ebbfc76c6fed31a868e4082e4bad13.tar.xz nixpkgs-ee1c85aee9ebbfc76c6fed31a868e4082e4bad13.tar.zst nixpkgs-ee1c85aee9ebbfc76c6fed31a868e4082e4bad13.zip | |
mariadb: lib -> connector-c
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gdal/gdal-1_11.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 984d3da8119..0f1637a87e9 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--with-poppler=${poppler.dev}" # optional "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${mysql.lib.dev}/bin/mysql_config" + "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-sqlite3=${sqlite.dev}" "--with-spatialite=${libspatialite}" diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index c9f0c076101..d7906cfdc7d 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${mysql.lib.dev}/bin/mysql_config" + "--with-mysql=${mysql.connector-c}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-python" # optional "--with-static-proj4=${proj}" # optional diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 32691faa689..488306fc1ce 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -160,7 +160,7 @@ stdenv.mkDerivation rec { buildInputs = [ cups # Qt dlopen's libcups instead of linking to it postgresql sqlite libjpeg libmng libtiff icu ] - ++ optionals (mysql != null) [ mysql.lib ] + ++ optionals (mysql != null) [ mysql.connector-c ] ++ optionals gtkStyle [ gtk2 gdk_pixbuf ] ++ optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ]; |