diff options
| author | Robin Gloster <mail@glob.in> | 2017-12-25 16:57:13 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-12-29 02:18:35 +0100 |
| commit | d75ae56f3fb72ec756b0da5c47b16e833a4905d7 (patch) | |
| tree | c1f38c48dd6df63ac0c0c56dea1e56245d1ca221 /pkgs/development/libraries | |
| parent | 4fb9533511067edb738e3350b6902d99c96176c0 (diff) | |
| download | nixlib-d75ae56f3fb72ec756b0da5c47b16e833a4905d7.tar nixlib-d75ae56f3fb72ec756b0da5c47b16e833a4905d7.tar.gz nixlib-d75ae56f3fb72ec756b0da5c47b16e833a4905d7.tar.bz2 nixlib-d75ae56f3fb72ec756b0da5c47b16e833a4905d7.tar.lz nixlib-d75ae56f3fb72ec756b0da5c47b16e833a4905d7.tar.xz nixlib-d75ae56f3fb72ec756b0da5c47b16e833a4905d7.tar.zst nixlib-d75ae56f3fb72ec756b0da5c47b16e833a4905d7.zip | |
mariadb: replace to connector-c
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/opendbx/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-3/default.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 37afa3fd5070..6a027dc9bd46 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { }; preConfigure = '' - export CPPFLAGS="-I${getDev mysql.client}/include/mysql" - export LDFLAGS="-L${getLib mysql.client}/lib/mysql -L${getLib postgresql}/lib" + export CPPFLAGS="-I${mysql.connector-c}/include/mariadb" + export LDFLAGS="-L${mysql.connector-c}/lib/mariadb -L${postgresql}/lib" configureFlagsArray=(--with-backends="mysql pgsql sqlite3") ''; - buildInputs = [ readline mysql.client postgresql sqlite ]; + buildInputs = [ readline mysql.connector-c postgresql sqlite ]; } diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 6d92de001cb7..92cdc1f918aa 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { -I${randrproto}/include" else "-no-xrandr"} ${if xineramaSupport then "-xinerama -L${libXinerama.out}/lib -I${libXinerama.dev}/include" else "-no-xinerama"} ${if cursorSupport then "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" else ""} - ${if mysqlSupport then "-qt-sql-mysql -L${stdenv.lib.getLib mysql.client}/lib/mysql -I${mysql.client}/include/mysql" else ""} + ${if mysqlSupport then "-qt-sql-mysql -L${mysql.connector-c}/lib/mariadb -I${mysql.connector-c}/include/mariadb" else ""} ${if xftSupport then "-xft -L${libXft.out}/lib -I${libXft.dev}/include -L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include |