public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mariadb: replace to connector-c

Browse Source
This commit is contained in:
Robin Gloster 2017-12-25 16:57:13 +01:00
parent 4fb9533511
commit d75ae56f3f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/opendbx/default.nix
View File

@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
}; };
preConfigure = '' preConfigure = ''
export CPPFLAGS="-I${getDev mysql.client}/include/mysql" export CPPFLAGS="-I${mysql.connector-c}/include/mariadb"
export LDFLAGS="-L${getLib mysql.client}/lib/mysql -L${getLib postgresql}/lib" export LDFLAGS="-L${mysql.connector-c}/lib/mariadb -L${postgresql}/lib"
configureFlagsArray=(--with-backends="mysql pgsql sqlite3") configureFlagsArray=(--with-backends="mysql pgsql sqlite3")
''; '';
buildInputs = [ readline mysql.client postgresql sqlite ]; buildInputs = [ readline mysql.connector-c postgresql sqlite ];
} }

2
pkgs/development/libraries/qt-3/default.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation {
-I${randrproto}/include" else "-no-xrandr"} -I${randrproto}/include" else "-no-xrandr"}
${if xineramaSupport then "-xinerama -L${libXinerama.out}/lib -I${libXinerama.dev}/include" else "-no-xinerama"} ${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 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 ${if xftSupport then "-xft
-L${libXft.out}/lib -I${libXft.dev}/include -L${libXft.out}/lib -I${libXft.dev}/include
-L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include -L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include

4
pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
View File

@ -56,8 +56,8 @@ in
propagatedBuildInputs = with pkgs; [mysql postgresql sqlite zlib]; propagatedBuildInputs = with pkgs; [mysql postgresql sqlite zlib];
overrides = y: (x.overrides y) // { overrides = y: (x.overrides y) // {
preConfigure = ((x.overrides y).preConfigure or "") + '' preConfigure = ((x.overrides y).preConfigure or "") + ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.lib.getDev pkgs.mysql.client}/include/mysql" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mariadb"
export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.lib.getLib pkgs.mysql.client}/lib/mysql" export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mariadb"
''; '';
}; };
}; };

4
pkgs/servers/games/ghost-one/default.nix
View File

@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "1sm2ca3lcdr4vjg7v94d8zhqz8cdp44rg8yinzzwkgsr0hj74fv2"; sha256 = "1sm2ca3lcdr4vjg7v94d8zhqz8cdp44rg8yinzzwkgsr0hj74fv2";
}; };
buildInputs = [ unzip gmp zlib bzip2 boost mysql.client ]; buildInputs = [ unzip gmp zlib bzip2 boost mysql.connector-c ];
patchPhase = '' patchPhase = ''
substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" \ substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" \
"${stdenv.lib.getLib mysql.client}/lib/mysql" "${mysql.connector-c}/lib/mariadb"
''; '';
buildPhase = '' buildPhase = ''