From a604b4248054b31bbdfd1c96fdf591793859abc5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 1 Apr 2015 16:39:50 -0700
Subject: [PATCH] mysql: Use libs in place of the binary mysql

---
 pkgs/applications/audio/amarok/default.nix           |  2 +-
 pkgs/applications/graphics/digikam/2.nix             |  2 +-
 pkgs/applications/graphics/digikam/default.nix       |  2 +-
 pkgs/applications/misc/mysql-workbench/default.nix   |  2 +-
 pkgs/applications/misc/stardict/stardict.nix         |  6 +++---
 pkgs/applications/office/calligra/default.nix        |  2 +-
 pkgs/applications/video/kodi/default.nix             |  2 +-
 pkgs/development/compilers/urweb/default.nix         |  4 ++--
 pkgs/development/interpreters/php/5.4.nix            | 12 ++++++------
 pkgs/development/interpreters/php/5.5.nix            | 12 ++++++------
 pkgs/development/interpreters/php/5.6.nix            | 12 ++++++------
 .../ruby/bundler-env/default-gem-config.nix          |  2 +-
 .../development/libraries/libdbi-drivers/default.nix |  6 +++---
 pkgs/development/libraries/qt-3/default.nix          |  2 +-
 pkgs/development/libraries/qt-4.x/4.8/default.nix    |  2 +-
 pkgs/development/libraries/qt-5/5.3/default.nix      |  2 +-
 .../libraries/unixODBCDrivers/default.nix            |  4 ++--
 pkgs/development/ocaml-modules/mysql/default.nix     |  6 +++---
 pkgs/development/tools/misc/sysbench/default.nix     |  5 ++++-
 pkgs/servers/computing/slurm/default.nix             |  2 +-
 pkgs/servers/games/ghost-one/default.nix             |  6 +++---
 pkgs/servers/http/lighttpd/default.nix               |  2 +-
 pkgs/servers/restund/default.nix                     |  6 +++---
 pkgs/tools/backup/bareos/default.nix                 |  4 ++--
 pkgs/tools/networking/mailutils/default.nix          |  2 +-
 .../package-management/disnix/dysnomia/default.nix   |  2 +-
 pkgs/tools/system/collectd/default.nix               |  2 +-
 pkgs/tools/system/rsyslog/default.nix                |  2 +-
 28 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index d695150bf319..6ecdc1f98d44 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -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";
diff --git a/pkgs/applications/graphics/digikam/2.nix b/pkgs/applications/graphics/digikam/2.nix
index be991772d395..c239827633f0 100644
--- a/pkgs/applications/graphics/digikam/2.nix
+++ b/pkgs/applications/graphics/digikam/2.nix
@@ -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}";
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 5ace07f827bb..70966196b077 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -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
   ];
 
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index efe8785654a9..4f2c2fba97c4 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -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"
diff --git a/pkgs/applications/misc/stardict/stardict.nix b/pkgs/applications/misc/stardict/stardict.nix
index d4c41edde30e..600642f488ac 100644
--- a/pkgs/applications/misc/stardict/stardict.nix
+++ b/pkgs/applications/misc/stardict/stardict.nix
@@ -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'
 
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index ac3072f62b59..89bc4ecb4c8d 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -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
   ];
 
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index f296ca3edcfd..0b18705e6fbe 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -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
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 71271ee7ed87..6d5b49da0669 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -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";
     '';
 
diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index 8eda7eef2229..6796a1952864 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -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 = {
diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix
index fac046548470..87aff4ff1a28 100644
--- a/pkgs/development/interpreters/php/5.5.nix
+++ b/pkgs/development/interpreters/php/5.5.nix
@@ -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 = {
diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix
index 6559ecfa658c..1fa987089208 100644
--- a/pkgs/development/interpreters/php/5.6.nix
+++ b/pkgs/development/interpreters/php/5.6.nix
@@ -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 = {
diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
index cf7bf881a8f0..cadda2887644 100644
--- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
+++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
@@ -57,7 +57,7 @@ in
   };
 
   mysql2 = attrs: {
-    buildInputs = [ mysql zlib openssl ];
+    buildInputs = [ mysql.lib zlib openssl ];
   };
 
   ncursesw = attrs: {
diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix
index 542aa3cb340e..128553705e0b 100644
--- a/pkgs/development/libraries/libdbi-drivers/default.nix
+++ b/pkgs/development/libraries/libdbi-drivers/default.nix
@@ -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"
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 432b4358f7ac..ffad44188154 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -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
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index a8d8beb41453..06ff3fe66d40 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -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 ];
diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix
index 98fd20c44c00..d7ae685af6d7 100644
--- a/pkgs/development/libraries/qt-5/5.3/default.nix
+++ b/pkgs/development/libraries/qt-5/5.3/default.nix
@@ -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 ];
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 03769815a3e2..74a142318019 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -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 =
diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix
index 0ae60ab07e4a..4ffef60c4bfc 100644
--- a/pkgs/development/ocaml-modules/mysql/default.nix
+++ b/pkgs/development/ocaml-modules/mysql/default.nix
@@ -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 = ''
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index 1b4cab361ce5..e4c2b474d46f 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -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
   '';
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index 25f3fbb5a642..a1a1a2ea1f2d 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -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}
diff --git a/pkgs/servers/games/ghost-one/default.nix b/pkgs/servers/games/ghost-one/default.nix
index f90b5e409973..3c1430157d02 100644
--- a/pkgs/servers/games/ghost-one/default.nix
+++ b/pkgs/servers/games/ghost-one/default.nix
@@ -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 ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index f564cb0d483c..056f9202df48 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -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"
diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix
index 65e957852fbf..705a4ba43e7f 100644
--- a/pkgs/servers/restund/default.nix
+++ b/pkgs/servers/restund/default.nix
@@ -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;
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index 5342b4f489dc..c375937ba241 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -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"
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index 5326c9059de5..0b57a752a375 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -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
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index 6fa95f060d7b..021225c1b4d4 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -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;
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 692016153a6c..e01490782715 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -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
   ];
 
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 2f62ce31949d..a9fabd19f478 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -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;