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 | |
| parent | 4fb9533511067edb738e3350b6902d99c96176c0 (diff) | |
| download | nixpkgs-d75ae56f3fb72ec756b0da5c47b16e833a4905d7.tar nixpkgs-d75ae56f3fb72ec756b0da5c47b16e833a4905d7.tar.gz nixpkgs-d75ae56f3fb72ec756b0da5c47b16e833a4905d7.tar.bz2 nixpkgs-d75ae56f3fb72ec756b0da5c47b16e833a4905d7.tar.lz nixpkgs-d75ae56f3fb72ec756b0da5c47b16e833a4905d7.tar.xz nixpkgs-d75ae56f3fb72ec756b0da5c47b16e833a4905d7.tar.zst nixpkgs-d75ae56f3fb72ec756b0da5c47b16e833a4905d7.zip | |
mariadb: replace to connector-c
Diffstat (limited to 'pkgs')
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 37afa3fd507..6a027dc9bd4 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 6d92de001cb..92cdc1f918a 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 diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index fae5818171b..6ca3a608934 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -56,8 +56,8 @@ in propagatedBuildInputs = with pkgs; [mysql postgresql sqlite zlib]; overrides = y: (x.overrides y) // { preConfigure = ((x.overrides y).preConfigure or "") + '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.lib.getDev pkgs.mysql.client}/include/mysql" - export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.lib.getLib pkgs.mysql.client}/lib/mysql" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mariadb" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mariadb" ''; }; }; diff --git a/pkgs/servers/games/ghost-one/default.nix b/pkgs/servers/games/ghost-one/default.nix index 63a71633923..ec56f526200 100644 --- a/pkgs/servers/games/ghost-one/default.nix +++ b/pkgs/servers/games/ghost-one/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1sm2ca3lcdr4vjg7v94d8zhqz8cdp44rg8yinzzwkgsr0hj74fv2"; }; - buildInputs = [ unzip gmp zlib bzip2 boost mysql.client ]; + buildInputs = [ unzip gmp zlib bzip2 boost mysql.connector-c ]; patchPhase = '' substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" \ - "${stdenv.lib.getLib mysql.client}/lib/mysql" + "${mysql.connector-c}/lib/mariadb" ''; buildPhase = '' |