b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

mysql: Use libs in place of the binary mysql

Browse source
This commit is contained in:
William A. Kennington III 2015-04-01 16:39:50 -07:00
parent bc7b39784a
commit a604b42480
28 changed files with 59 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/audio/amarok/default.nix
View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
buildInputs = [ qtscriptgenerator stdenv.cc.libc gettext curl
libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi
libxml2 mysql.lib taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi
soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa nepomuk_core ];
cmakeFlags = "-DKDE4_BUILD_TESTS=OFF";

2
pkgs/applications/graphics/digikam/2.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ];
opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql.lib ];
# Make digikam find some FindXXXX.cmake
KDEDIRS="${marble}:${qjson}";

2
pkgs/applications/graphics/digikam/default.nix
View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [
boost eigen gettext jasper kdelibs kdepimlibs lcms lensfun
libgphoto2 libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf
libtiff marble mysql opencv phonon qca2 qimageblitz qjson qt4
libtiff marble mysql.lib opencv phonon qca2 qimageblitz qjson qt4
shared_desktop_ontologies soprano
];

2
pkgs/applications/misc/mysql-workbench/default.nix
View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ autoconf automake boost file gettext glib glibc libgnome_keyring gtk gtkmm intltool
libctemplate libglade libgnome libiodbc libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa
mysql paramiko pcre pexpect pkgconfig pycrypto python sqlite ];
mysql.lib paramiko pcre pexpect pkgconfig pycrypto python sqlite ];
preConfigure = ''
substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv"

6
pkgs/applications/misc/stardict/stardict.nix
View file

@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
sha256 = "0wrb8xqy6x9piwrn0vw5alivr9h3b70xlf51qy0jpl6d7mdhm8cv";
};
buildInputs = [ pkgconfig gtk glib zlib libxml2 intltool gnome_doc_utils libgnomeui scrollkeeper mysql pcre which libxslt];
buildInputs = [ pkgconfig gtk glib zlib libxml2 intltool gnome_doc_utils libgnomeui scrollkeeper mysql.lib pcre which libxslt];
postPatch = ''
# mysql hacks: we need dynamic linking as there is no libmysqlclient.a
substituteInPlace tools/configure --replace '/usr/local/include/mysql' '${mysql}/include/mysql/'
substituteInPlace tools/configure --replace '/usr/local/include/mysql' '${mysql.lib}/include/mysql/'
substituteInPlace tools/configure --replace 'AC_FIND_FILE([libmysqlclient.a]' 'AC_FIND_FILE([libmysqlclient.so]'
substituteInPlace tools/configure --replace '/usr/local/lib/mysql' '${mysql}/lib/mysql/'
substituteInPlace tools/configure --replace '/usr/local/lib/mysql' '${mysql.lib}/lib/mysql/'
substituteInPlace tools/configure --replace 'for y in libmysqlclient.a' 'for y in libmysqlclient.so'
substituteInPlace tools/configure --replace 'libmysqlclient.a' 'libmysqlclient.so'

2
pkgs/applications/office/calligra/default.nix
View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype
sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl
shared_desktop_ontologies okular libodfgen opencolorio openjpeg
libvisio kactivities mysql postgresql freetds xbase openexr pstoedit
libvisio kactivities mysql.lib postgresql freetds xbase openexr pstoedit
librevenge
];

2
pkgs/applications/video/kodi/default.nix
View file

@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
libmpeg2 libsamplerate libmad
libogg libvorbis flac libxslt systemd
lzo libcdio libmodplug libass libbluray
sqlite mysql nasm avahi libdvdcss lame
sqlite mysql.lib nasm avahi libdvdcss lame
curl bzip2 zip unzip glxinfo xdpyinfo
]
++ lib.optional dbusSupport dbus_libs

4
pkgs/development/compilers/urweb/default.nix
View file

@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
''
export CC="${stdenv.cc}/bin/gcc";
export CCARGS="-I$out/include \
-L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib";
-L${mysql.lib}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib";
export PGHEADER="${postgresql}/include/libpq-fe.h";
export MSHEADER="${mysql}/include/mysql/mysql.h";
export MSHEADER="${mysql.lib}/include/mysql/mysql.h";
export SQHEADER="${sqlite}/include/sqlite3.h";
'';

12
pkgs/development/interpreters/php/5.4.nix
View file

@ -87,13 +87,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
};
mysql = {
configureFlags = ["--with-mysql=${mysql}"];
buildInputs = [ mysql ];
configureFlags = ["--with-mysql=${mysql.lib}"];
buildInputs = [ mysql.lib ];
};
mysqli = {
configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"];
buildInputs = [ mysql];
configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"];
buildInputs = [ mysql.lib ];
};
mysqli_embedded = {
@ -103,8 +103,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
};
pdo_mysql = {
configureFlags = ["--with-pdo-mysql=${mysql}"];
buildInputs = [ mysql ];
configureFlags = ["--with-pdo-mysql=${mysql.lib}"];
buildInputs = [ mysql.lib ];
};
bcmath = {

12
pkgs/development/interpreters/php/5.5.nix
View file

@ -90,13 +90,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
};
mysql = {
configureFlags = ["--with-mysql=${mysql}"];
buildInputs = [ mysql ];
configureFlags = ["--with-mysql=${mysql.lib}"];
buildInputs = [ mysql.lib ];
};
mysqli = {
configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"];
buildInputs = [ mysql];
configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"];
buildInputs = [ mysql.lib ];
};
mysqli_embedded = {
@ -106,8 +106,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
};
pdo_mysql = {
configureFlags = ["--with-pdo-mysql=${mysql}"];
buildInputs = [ mysql ];
configureFlags = ["--with-pdo-mysql=${mysql.lib}"];
buildInputs = [ mysql.lib ];
};
bcmath = {

12
pkgs/development/interpreters/php/5.6.nix
View file

@ -90,13 +90,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
};
mysql = {
configureFlags = ["--with-mysql=${mysql}"];
buildInputs = [ mysql ];
configureFlags = ["--with-mysql=${mysql.lib}"];
buildInputs = [ mysql.lib ];
};
mysqli = {
configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"];
buildInputs = [ mysql];
configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"];
buildInputs = [ mysql.lib ];
};
mysqli_embedded = {
@ -106,8 +106,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
};
pdo_mysql = {
configureFlags = ["--with-pdo-mysql=${mysql}"];
buildInputs = [ mysql ];
configureFlags = ["--with-pdo-mysql=${mysql.lib}"];
buildInputs = [ mysql.lib ];
};
bcmath = {

2
pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
View file

@ -57,7 +57,7 @@ in
};
mysql2 = attrs: {
buildInputs = [ mysql zlib openssl ];
buildInputs = [ mysql.lib zlib openssl ];
};
ncursesw = attrs: {

6
pkgs/development/libraries/libdbi-drivers/default.nix
View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";
};
buildInputs = [ libdbi mysql sqlite postgresql ];
buildInputs = [ libdbi mysql.lib sqlite postgresql ];
postPatch = ''
sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;
@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
"--with-dbi-libdir=${libdbi}/lib"
] ++ optionals (mysql != null) [
"--with-mysql"
"--with-mysql-incdir=${mysql}/include/mysql"
"--with-mysql-libdir=${mysql}/lib/mysql"
"--with-mysql-incdir=${mysql.lib}/include/mysql"
"--with-mysql-libdir=${mysql.lib}/lib/mysql"
] ++ optionals (postgresql != null) [
"--with-pgsql"
"--with-pgsql_incdir=${postgresql}/include"

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

@ -47,7 +47,7 @@ stdenv.mkDerivation {
-I${randrproto}/include" else "-no-xrandr"}
${if xineramaSupport then "-xinerama -L${libXinerama}/lib -I${libXinerama}/include" else "-no-xinerama"}
${if cursorSupport then "-L${libXcursor}/lib -I${libXcursor}/include" else ""}
${if mysqlSupport then "-qt-sql-mysql -L${mysql}/lib/mysql -I${mysql}/include/mysql" else ""}
${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""}
${if xftSupport then "-xft
-L${libXft}/lib -I${libXft}/include
-L${libXft.freetype}/lib -I${libXft.freetype}/include

2
pkgs/development/libraries/qt-4.x/4.8/default.nix
View file

@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
# The following libraries are only used in plugins
buildInputs =
[ cups # Qt dlopen's libcups instead of linking to it
mysql postgresql sqlite libjpeg libmng libtiff icu ]
mysql.lib postgresql sqlite libjpeg libmng libtiff icu ]
++ optionals gtkStyle [ gtk gdk_pixbuf ];
nativeBuildInputs = [ perl pkgconfig which ];

2
pkgs/development/libraries/qt-5/5.3/default.nix
View file

@ -153,7 +153,7 @@ stdenv.mkDerivation rec {
# doesn't remain a runtime-dep if not used
++ optionals mesaSupported [ mesa mesa_glu ]
++ optional (cups != null) cups
++ optional (mysql != null) mysql
++ optional (mysql != null) mysql.lib
++ optional (postgresql != null) postgresql;
buildInputs = [ gdb bison flex gperf ruby ];

4
pkgs/development/libraries/unixODBCDrivers/default.nix
View file

@ -64,8 +64,8 @@ args : with args;
md5 = "a484f590464fb823a8f821b2f1fd7fef";
};
configureFlags = "--disable-gui"
+ " --with-mysql-path=${mysql} --with-unixODBC=${unixODBC}";
buildInputs = [libtool zlib];
+ " --with-mysql-path=${mysql.lib} --with-unixODBC=${unixODBC}";
buildInputs = [ libtool zlib ];
inherit mysql unixODBC;
};
ini =

6
pkgs/development/ocaml-modules/mysql/default.nix
View file

@ -23,14 +23,14 @@ stdenv.mkDerivation {
"--libdir=$out/lib/ocaml/${ocaml_version}/site-lib/mysql"
];
buildInputs = [ocaml findlib mysql];
buildInputs = [ocaml findlib mysql.lib ];
createFindlibDestdir = true;
propagatedbuildInputs = [mysql];
propagatedbuildInputs = [ mysql.lib ];
preConfigure = ''
export LDFLAGS="-L${mysql}/lib/mysql"
export LDFLAGS="-L${mysql.lib}/lib/mysql"
'';
buildPhase = ''

5
pkgs/development/tools/misc/sysbench/default.nix
View file

@ -2,11 +2,14 @@
stdenv.mkDerivation rec {
name = "sysbench-0.4.12";
buildInputs = [ autoreconfHook mysql libxslt zlib ];
buildInputs = [ autoreconfHook mysql.lib libxslt zlib ];
src = fetchurl {
url = mirror://sourceforge/sysbench/sysbench-0.4.12.tar.gz;
sha256 = "17pa4cw7wxvlb4mba943lfs3b3jdi64mlnaf4n8jq09y35j79yl3";
};
preAutoreconf = ''
touch NEWS AUTHORS
'';

2
pkgs/servers/computing/slurm/default.nix
View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0xx1q9ximsyyipl0xbj8r7ajsz4xrxik8xmhcb1z9nv0aza1rff2";
};
buildInputs = [ python munge perl pam openssl mysql ];
buildInputs = [ python munge perl pam openssl mysql.lib ];
configureFlags = ''
--with-munge=${munge}

6
pkgs/servers/games/ghost-one/default.nix
View file

@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "1sm2ca3lcdr4vjg7v94d8zhqz8cdp44rg8yinzzwkgsr0hj74fv2";
};
buildInputs = [ unzip gmp zlib bzip2 boost mysql ];
buildInputs = [ unzip gmp zlib bzip2 boost mysql.lib ];
patchPhase = ''
substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" "${mysql}/lib/mysql"
substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" "${mysql.lib}/lib/mysql"
'';
buildPhase = ''
@ -50,4 +50,4 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
maintainers = [ maintainers.phreedom ];
};
}
}

2
pkgs/servers/http/lighttpd/default.nix
View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]
++ stdenv.lib.optional enableMagnet lua5_1
++ stdenv.lib.optional enableMysql mysql;
++ stdenv.lib.optional enableMysql mysql.lib;
configureFlags = [ "--with-openssl" ]
++ stdenv.lib.optional enableMagnet "--with-lua"

6
pkgs/servers/restund/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, zlib, openssl, libre, librem, mysql}:
{ stdenv, fetchurl, zlib, openssl, libre, librem, mysql }:
stdenv.mkDerivation rec {
version = "0.4.2";
name = "restund-${version}";
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
url = "http://www.creytiv.com/pub/restund-${version}.tar.gz";
sha256 = "db5260939d40cb2ce531075bef02b9d6431067bdd52f3168a6f25246bdf7b9f2";
};
buildInputs = [zlib openssl libre librem mysql];
buildInputs = [ zlib openssl libre librem mysql.lib ];
makeFlags = [
"LIBRE_MK=${libre}/share/re/re.mk"
"LIBRE_INC=${libre}/include/re"
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
;
NIX_LDFLAGS='' -L${mysql}/lib/mysql '';
NIX_LDFLAGS='' -L${mysql.lib}/lib/mysql '';
meta = {
homepage = "http://www.creytiv.com/restund.html";
platforms = with stdenv.lib.platforms; linux;

4
pkgs/tools/backup/bareos/default.nix
View file

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig nettools gettext readline openssl python
ncurses sqlite postgresql mysql zlib lzo acl glusterfs ceph libcap
ncurses sqlite postgresql mysql.lib zlib lzo acl glusterfs ceph libcap
];
postPatch = ''
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
++ optional (openssl != null) "--with-openssl=${openssl}"
++ optional (sqlite != null) "--with-sqlite3=${sqlite}"
++ optional (postgresql != null) "--with-postgresql=${postgresql}"
++ optional (mysql != null) "--with-mysql=${mysql}"
++ optional (mysql != null) "--with-mysql=${mysql.lib}"
++ optional (zlib != null) "--with-zlib=${zlib}"
++ optional (lzo != null) "--with-lzo=${lzo}"
++ optional (acl != null) "--enable-acl"

2
pkgs/tools/networking/mailutils/default.nix
View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ gettext gdbm libtool pam readline ncurses
gnutls mysql guile texinfo gnum4 ]
gnutls mysql.lib guile texinfo gnum4 ]
++ stdenv.lib.optional doCheck dejagnu;
# Tests fail since gcc 4.8

2
pkgs/tools/package-management/disnix/dysnomia/default.nix
View file

@ -42,7 +42,7 @@ stdenv.mkDerivation {
buildInputs = [ getopt ]
++ stdenv.lib.optional enableEjabberdDump ejabberd
++ stdenv.lib.optional enableMySQLDatabase mysql
++ stdenv.lib.optional enableMySQLDatabase mysql.lib
++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
++ stdenv.lib.optional enableSubversionRepository subversion
++ stdenv.lib.optional enableMongoDatabase mongodb;

2
pkgs/tools/system/collectd/default.nix
View file

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig curl iptables libcredis libdbi libgcrypt libmemcached cyrus_sasl
libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
lm_sensors libxml2 lvm2 mysql postgresql protobufc rabbitmq-c rrdtool
lm_sensors libxml2 lvm2 mysql.lib postgresql protobufc rabbitmq-c rrdtool
varnish yajl
];

2
pkgs/tools/system/rsyslog/default.nix
View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig libestr json_c zlib pythonPackages.docutils
krb5 jemalloc mysql postgresql libdbi net_snmp libuuid curl gnutls
krb5 jemalloc mysql.lib postgresql libdbi net_snmp libuuid curl gnutls
libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka
libmongo-client czmq rabbitmq-c hiredis
] ++ stdenv.lib.optional stdenv.isLinux systemd;