treewide: fixup various mysql ocurrences after re-split
This commit is contained in:
parent
9a072482e6
commit
950feb70b2
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
|
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.lib
|
qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.server/*libmysqld*/
|
||||||
taglib taglib_extras loudmouth kdelibs phonon strigi soprano qca2
|
taglib taglib_extras loudmouth kdelibs phonon strigi soprano qca2
|
||||||
libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core
|
libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core
|
||||||
lz4 lzo snappy libaio pcre
|
lz4 lzo snappy libaio pcre
|
||||||
|
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite pkgconfig cairo
|
buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite pkgconfig cairo
|
||||||
readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.lib blas ]
|
readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ]
|
||||||
++ (with pythonPackages; [ python dateutil wxPython30 numpy sqlite3 ]);
|
++ (with pythonPackages; [ python dateutil wxPython30 numpy sqlite3 ]);
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
|
@ -22,7 +22,8 @@ stdenv.mkDerivation {
|
||||||
"--with-netcdf"
|
"--with-netcdf"
|
||||||
"--with-geos"
|
"--with-geos"
|
||||||
"--with-postgres" "--with-postgres-libs=${postgresql.lib}/lib/"
|
"--with-postgres" "--with-postgres-libs=${postgresql.lib}/lib/"
|
||||||
"--with-mysql" "--with-mysql-includes=${mysql.lib}/include/mysql"
|
# it complains about missing libmysqld but doesn't really seem to need it
|
||||||
|
"--with-mysql" "--with-mysql-includes=${stdenv.lib.getDev mysql.client}/include/mysql"
|
||||||
"--with-blas"
|
"--with-blas"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl
|
[ cmake pkgconfig boost libunwind mariadb.client libmemcached pcre gdb git perl
|
||||||
libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
|
libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
|
||||||
oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
|
oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
|
||||||
libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5
|
libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5
|
||||||
|
@ -29,8 +29,6 @@ stdenv.mkDerivation rec {
|
||||||
enableParallelBuilding = false; # occasional build problems;
|
enableParallelBuilding = false; # occasional build problems;
|
||||||
dontUseCmakeBuildDir = true;
|
dontUseCmakeBuildDir = true;
|
||||||
NIX_LDFLAGS = "-lpam -L${pam}/lib";
|
NIX_LDFLAGS = "-lpam -L${pam}/lib";
|
||||||
MYSQL_INCLUDE_DIR="${mariadb}/include/mysql";
|
|
||||||
MYSQL_DIR=mariadb;
|
|
||||||
|
|
||||||
# work around broken build system
|
# work around broken build system
|
||||||
NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";
|
NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, file, openssl, mlton
|
{ stdenv, lib, fetchurl, file, openssl, mlton
|
||||||
, mysql, postgresql, sqlite
|
, mysql, postgresql, sqlite
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "08km96hli5yp754nsxxjzih2la0m89j5wc2cq12rkas43nqqgr65";
|
sha256 = "08km96hli5yp754nsxxjzih2la0m89j5wc2cq12rkas43nqqgr65";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ openssl mlton mysql postgresql sqlite ];
|
buildInputs = [ openssl mlton mysql.client postgresql sqlite ];
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
|
sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
|
||||||
|
@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
export PGHEADER="${postgresql}/include/libpq-fe.h";
|
export PGHEADER="${postgresql}/include/libpq-fe.h";
|
||||||
export MSHEADER="${mysql.lib}/include/mysql/mysql.h";
|
export MSHEADER="${lib.getDev mysql.client}/include/mysql/mysql.h";
|
||||||
export SQHEADER="${sqlite.dev}/include/sqlite3.h";
|
export SQHEADER="${sqlite.dev}/include/sqlite3.h";
|
||||||
|
|
||||||
export CCARGS="-I$out/include \
|
export CCARGS="-I$out/include \
|
||||||
-L${mysql.lib}/lib/mysql \
|
-L${lib.getLib mysql.client}/lib/mysql \
|
||||||
-L${postgresql.lib}/lib \
|
-L${postgresql.lib}/lib \
|
||||||
-L${sqlite.out}/lib";
|
-L${sqlite.out}/lib";
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -107,7 +107,7 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
mysql = {
|
mysql = {
|
||||||
configureFlags = ["--with-mysql=${mysql.lib}"];
|
configureFlags = ["--with-mysql"];
|
||||||
buildInputs = [ mysql.lib ];
|
buildInputs = [ mysql.lib ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
|
||||||
"--with-dbi-libdir=${libdbi}/lib"
|
"--with-dbi-libdir=${libdbi}/lib"
|
||||||
] ++ optionals (libmysql != null) [
|
] ++ optionals (libmysql != null) [
|
||||||
"--with-mysql"
|
"--with-mysql"
|
||||||
"--with-mysql-incdir=${libmysql}/include/mysql"
|
|
||||||
"--with-mysql-libdir=${libmysql}/lib/mysql"
|
|
||||||
] ++ optionals (postgresql != null) [
|
] ++ optionals (postgresql != null) [
|
||||||
"--with-pgsql"
|
"--with-pgsql"
|
||||||
"--with-pgsql_incdir=${postgresql}/include"
|
"--with-pgsql_incdir=${postgresql}/include"
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
|
{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (stdenv.lib) getDev getLib;
|
||||||
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "opendbx-1.4.6";
|
name = "opendbx-1.4.6";
|
||||||
|
|
||||||
|
@ -9,10 +12,10 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
export CPPFLAGS="-I${mysql.lib}/include/mysql"
|
export CPPFLAGS="-I${getDev mysql.client}/include/mysql"
|
||||||
export LDFLAGS="-L${mysql.lib}/lib/mysql"
|
export LDFLAGS="-L${getLib mysql.client}/lib/mysql -L${getLib postgresql}/lib"
|
||||||
configureFlagsArray=(--with-backends="mysql pgsql sqlite3")
|
configureFlagsArray=(--with-backends="mysql pgsql sqlite3")
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [ readline mysql.lib postgresql sqlite ];
|
buildInputs = [ readline mysql.client postgresql sqlite ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,7 +47,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${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""}
|
${if mysqlSupport then "-qt-sql-mysql -L${stdenv.lib.getLib mysql.client}/lib/mysql -I${mysql.client}/include/mysql" 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
|
||||||
|
|
|
@ -192,7 +192,7 @@ let lispPackages = rec {
|
||||||
version = "git-20150514";
|
version = "git-20150514";
|
||||||
description = "Common Lisp SQL Interface library";
|
description = "Common Lisp SQL Interface library";
|
||||||
deps = [uffi];
|
deps = [uffi];
|
||||||
buildInputs = [pkgs.mysql.lib pkgs.zlib];
|
buildInputs = [pkgs.mysql.client pkgs.zlib];
|
||||||
# Source type: git
|
# Source type: git
|
||||||
src = pkgs.fetchgit {
|
src = pkgs.fetchgit {
|
||||||
url =
|
url =
|
||||||
|
@ -204,8 +204,8 @@ let lispPackages = rec {
|
||||||
};
|
};
|
||||||
overrides = x:{
|
overrides = x:{
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.lib}/include/mysql"
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${stdenv.lib.getDev pkgs.mysql.client}/include/mysql"
|
||||||
export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.lib}/lib/mysql"
|
export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.lib.getLib pkgs.mysql.client}/lib/mysql"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -23,15 +23,11 @@ stdenv.mkDerivation {
|
||||||
"--libdir=$out/lib/ocaml/${ocaml_version}/site-lib/mysql"
|
"--libdir=$out/lib/ocaml/${ocaml_version}/site-lib/mysql"
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [ocaml findlib mysql.lib camlp4 ];
|
buildInputs = [ocaml findlib camlp4 ];
|
||||||
|
|
||||||
createFindlibDestdir = true;
|
createFindlibDestdir = true;
|
||||||
|
|
||||||
propagatedBuildInputs = [ mysql.lib ];
|
propagatedBuildInputs = [ mysql.client ];
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
export LDFLAGS="-L${mysql.lib}/lib/mysql"
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
make
|
make
|
||||||
|
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
substituteInPlace configure \
|
substituteInPlace configure \
|
||||||
--replace /usr/include/mysql ${libmysql}/include/mysql
|
--replace /usr/include/mysql ${lib.getDev libmysql}/include/mysql
|
||||||
'';
|
'';
|
||||||
configureFlags = [ "--enable-dl"
|
configureFlags = [ "--enable-dl"
|
||||||
"--enable-odbc"
|
"--enable-odbc"
|
||||||
|
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysql
|
buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysql
|
||||||
makeWrapper ];
|
makeWrapper ];
|
||||||
|
|
||||||
NIX_LDFLAGS="-L${libmysql}/lib/mysql";
|
NIX_LDFLAGS="-L${stdenv.lib.getLib libmysql}/lib/mysql";
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/bin $out/share/zod
|
mkdir -p $out/bin $out/share/zod
|
||||||
|
|
|
@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
|
||||||
"--enable-preferences-extension"
|
"--enable-preferences-extension"
|
||||||
"--enable-long-usernames"
|
"--enable-long-usernames"
|
||||||
"--enable-external-lookup"
|
"--enable-external-lookup"
|
||||||
] ++ lib.optional withMySQL "--with-mysql-includes=${libmysql}/include/mysql"
|
] ++ lib.optional withMySQL "--with-mysql-includes=${lib.getDev libmysql}/include/mysql"
|
||||||
++ lib.optional withPgSQL "--with-pgsql-libraries=${postgresql.lib}/lib";
|
++ lib.optional withPgSQL "--with-pgsql-libraries=${postgresql.lib}/lib";
|
||||||
|
|
||||||
# Lots of things are hardwired to paths like sysconfdir. That's why we install with both "prefix" and "DESTDIR"
|
# Lots of things are hardwired to paths like sysconfdir. That's why we install with both "prefix" and "DESTDIR"
|
||||||
|
|
|
@ -11,7 +11,7 @@ let
|
||||||
"-DHAS_DB_BYPASS_MAKEDEFS_CHECK"
|
"-DHAS_DB_BYPASS_MAKEDEFS_CHECK"
|
||||||
"-fPIE" "-fstack-protector-all" "--param" "ssp-buffer-size=4" "-O2" "-D_FORTIFY_SOURCE=2"
|
"-fPIE" "-fstack-protector-all" "--param" "ssp-buffer-size=4" "-O2" "-D_FORTIFY_SOURCE=2"
|
||||||
] ++ lib.optional withPgSQL "-DHAS_PGSQL"
|
] ++ lib.optional withPgSQL "-DHAS_PGSQL"
|
||||||
++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysql}/include/mysql" ]
|
++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${lib.getDev libmysql}/include/mysql" ]
|
||||||
++ lib.optional withSQLite "-DHAS_SQLITE");
|
++ lib.optional withSQLite "-DHAS_SQLITE");
|
||||||
auxlibs = lib.concatStringsSep " " ([
|
auxlibs = lib.concatStringsSep " " ([
|
||||||
"-ldb" "-lnsl" "-lresolv" "-lsasl2" "-lcrypto" "-lssl" "-pie" "-Wl,-z,relro,-z,now"
|
"-ldb" "-lnsl" "-lresolv" "-lsasl2" "-lcrypto" "-lssl" "-pie" "-Wl,-z,relro,-z,now"
|
||||||
|
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||||
++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
|
++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
|
||||||
++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
|
++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
|
||||||
;
|
;
|
||||||
NIX_LDFLAGS='' -L${mysql.lib}/lib/mysql '';
|
NIX_LDFLAGS='' -L${stdenv.lib.getLib mysql.client}/lib/mysql '';
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://www.creytiv.com/restund.html";
|
homepage = "http://www.creytiv.com/restund.html";
|
||||||
platforms = with stdenv.lib.platforms; linux;
|
platforms = with stdenv.lib.platforms; linux;
|
||||||
|
|
Loading…
Reference in a new issue