Make mariadb conform to multiple-outputs

pkgs/applications/audio/amarok/default.nix

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

pkgs/applications/graphics/digikam/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl, automoc4, boost, shared_desktop_ontologies, cmake
 , eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun
 , libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff
-, libusb1, liblqr1, marble, mysql, opencv, phonon, pkgconfig, qca2
+, libusb1, liblqr1, marble, libmysql, opencv, phonon, pkgconfig, qca2
 , qimageblitz, qjson, qt4, soprano
 }:
 
@@ -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.lib opencv phonon qca2 qimageblitz qjson qt4
+    libtiff marble libmysql opencv phonon qca2 qimageblitz qjson qt4
     shared_desktop_ontologies soprano
   ];
 

pkgs/applications/misc/grass/default.nix

@@ -87,10 +87,10 @@ a.composableDerivation.composableDerivation {} (fix: {
   // wwf {
     name = "mysql";
     enable = {
-      buildInputs = [ a.mysql.lib ];
+      buildInputs = [ a.libmysql ];
       configureFlags = [
-        "--with-mysql-libs=${a.mysql.lib}/lib/mysql"
-        "--with-mysql-includes=${a.mysql.lib}/include/mysql"
+        "--with-mysql-libs=${a.libmysql.lib}/lib"
+        "--with-mysql-includes=${a.libmysql.dev}/include/mysql"
       ];
     };
   }

pkgs/applications/misc/mysql-workbench/default.nix

@@ -2,7 +2,7 @@
 , glib, glibc, libgnome_keyring, gnome_keyring, gtk, gtkmm, intltool
 , libctemplate, libglade
 , libiodbc
-, libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql
+, libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, libmysql
 , pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite, sudo
 }:
 
@@ -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.lib paramiko pcre pexpect pkgconfig pycrypto python sqlite ];
+    libmysql paramiko pcre pexpect pkgconfig pycrypto python sqlite ];
 
   preConfigure = ''
     substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv"

pkgs/applications/misc/stardict/stardict.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, gtk, glib, zlib, libxml2, intltool, gnome_doc_utils, libgnomeui, scrollkeeper, mysql, pcre, which, libxslt}:
+{stdenv, fetchurl, pkgconfig, gtk, glib, zlib, libxml2, intltool, gnome_doc_utils, libgnomeui, scrollkeeper, libmysql, pcre, which, libxslt}:
 stdenv.mkDerivation rec {
   name= "stardict-3.0.3";
 
@@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
     sha256 = "0wrb8xqy6x9piwrn0vw5alivr9h3b70xlf51qy0jpl6d7mdhm8cv";
   };
 
-  buildInputs = [ pkgconfig gtk glib zlib libxml2 intltool gnome_doc_utils libgnomeui scrollkeeper mysql.lib pcre which libxslt];
+  buildInputs = [ pkgconfig gtk glib zlib libxml2 intltool gnome_doc_utils libgnomeui scrollkeeper libmysql 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.lib}/include/mysql/'
+    substituteInPlace tools/configure --replace '/usr/local/include/mysql' '${libmysql.dev}/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}/lib/mysql/'
+    substituteInPlace tools/configure --replace '/usr/local/lib/mysql' '${libmysql.lib}/lib'
     substituteInPlace tools/configure --replace 'for y in libmysqlclient.a' 'for y in libmysqlclient.so'
     substituteInPlace tools/configure --replace 'libmysqlclient.a' 'libmysqlclient.so'
 

pkgs/applications/office/calligra/default.nix

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

pkgs/applications/video/kodi/default.nix

@@ -13,7 +13,7 @@
 , libmpeg2, libsamplerate, libmad
 , libogg, libvorbis, flac, libxslt
 , lzo, libcdio, libmodplug, libass, libbluray
-, sqlite, mysql, nasm, gnutls, libva, wayland
+, sqlite, libmysql, nasm, gnutls, libva, wayland
 , curl, bzip2, zip, unzip, glxinfo, xdpyinfo
 , dbus_libs ? null, dbusSupport ? true
 , udev, udevSupport ? true
@@ -67,7 +67,7 @@ in stdenv.mkDerivation rec {
       libmpeg2 libsamplerate libmad
       libogg libvorbis flac libxslt systemd
       lzo libcdio libmodplug libass libbluray
-      sqlite mysql.lib nasm avahi libdvdcss lame
+      sqlite libmysql nasm avahi libdvdcss lame
       curl bzip2 zip unzip glxinfo xdpyinfo
     ]
     ++ lib.optional dbusSupport dbus_libs

pkgs/development/compilers/hhvm/default.nix

@@ -2,7 +2,7 @@
 , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c
 , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
-, libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit
+, libxslt, ocaml, freetype, gdb, git, perl, libmysql, gmp, libyaml, libedit
 , libvpx, imagemagick, fribidi
 }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl
+    [ cmake pkgconfig boost libunwind libmysql libmemcached pcre gdb git perl
       libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
       oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
       libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = false;
   dontUseCmakeBuildDir = true;
   NIX_LDFLAGS = "-lpam -L${pam}/lib";
-  MYSQL_INCLUDE_DIR="${mariadb}/include/mysql";
-  MYSQL_DIR=mariadb;
+  MYSQL_INCLUDE_DIR="${libmysql.dev}/include/mysql";
+  MYSQL_DIR=libmysql;
 
   # work around broken build system
   NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";

pkgs/development/compilers/urweb/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file, openssl, mlton, mysql, postgresql, sqlite }:
+{ stdenv, fetchurl, file, openssl, mlton, libmysql, postgresql, sqlite }:
 
 stdenv.mkDerivation rec {
   pname = "urweb";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "f7b7587fe72c04f14581ded11588777f7bb61e392634966cc0354e13d69f236d";
   };
 
-  buildInputs = [ stdenv.cc file openssl mlton mysql postgresql sqlite ];
+  buildInputs = [ stdenv.cc file openssl mlton libmysql postgresql sqlite ];
 
   prePatch = ''
     sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
     ''
       export CC="${stdenv.cc}/bin/gcc";
       export CCARGS="-I$out/include \
-                      -L${mysql.lib}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib";
+                      -L${libmysql.lib}/lib -L${postgresql}/lib -L${sqlite}/lib";
 
       export PGHEADER="${postgresql}/include/libpq-fe.h";
-      export MSHEADER="${mysql.lib}/include/mysql/mysql.h";
+      export MSHEADER="${libmysql.dev}/include/mysql/mysql.h";
       export SQHEADER="${sqlite}/include/sqlite3.h";
     '';
 

pkgs/development/haskell-modules/configuration-common.nix

@@ -29,7 +29,7 @@ self: super: {
   hslua = super.hslua.override { lua = pkgs.lua5_1; };
 
   # Use the default version of mysql to build this package (which is actually mariadb).
-  mysql = super.mysql.override { mysql = pkgs.mysql.lib; };
+  mysql = super.mysql.override { mysql = pkgs.libmysql; };
 
   # Please also remove optparse-applicative special case from
   # cabal2nix/hackage2nix.hs when removing the following.

pkgs/development/interpreters/php/generic.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
-, mysql, libxml2, readline, zlib, curl, postgresql, gettext
+, libmysql, libxml2, readline, zlib, curl, postgresql, gettext
 , openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
 , uwimap, pam, gmp
@@ -96,13 +96,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     };
 
     mysql = {
-      configureFlags = ["--with-mysql=${mysql.lib}"];
-      buildInputs = [ mysql.lib ];
+      configureFlags = ["--with-mysql=${libmysql}"];
+      buildInputs = [ libmysql ];
     };
 
     mysqli = {
-      configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"];
-      buildInputs = [ mysql.lib ];
+      configureFlags = ["--with-mysqli=${libmysql.dev}/bin/mysql_config"];
+      buildInputs = [ libmysql ];
     };
 
     mysqli_embedded = {
@@ -112,8 +112,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     };
 
     pdo_mysql = {
-      configureFlags = ["--with-pdo-mysql=${mysql.lib}"];
-      buildInputs = [ mysql.lib ];
+      configureFlags = ["--with-pdo-mysql=${libmysql}"];
+      buildInputs = [ libmysql ];
     };
 
     bcmath = {

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

@@ -20,7 +20,7 @@
 { lib, fetchurl, writeScript, ruby, libxml2, libxslt, python, stdenv, which
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
 , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
-, cmake, libssh2, openssl, mysql
+, cmake, libssh2, openssl, libmysql
 }:
 
 let
@@ -48,7 +48,7 @@ in
   };
 
   mysql2 = attrs: {
-    buildInputs = [ mysql.lib zlib openssl ];
+    buildInputs = [ libmysql zlib openssl ];
   };
 
   ncursesw = attrs: {

pkgs/development/libraries/gdal/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
-, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl
+, postgresql, libmysql, libgeotiff, python, pythonPackages, proj, geos, openssl
 , libpng }:
 
 composableDerivation.composableDerivation {} (fixed: rec {
@@ -30,7 +30,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
     "--with-libz=${zlib}"       # optional
 
     "--with-pg=${postgresql}/bin/pg_config"
-    "--with-mysql=${mysql.lib}/bin/mysql_config"
+    "--with-mysql=${libmysql}/bin/mysql_config"
     "--with-geotiff=${libgeotiff}"
     "--with-python"               # optional
     "--with-static-proj4=${proj}" # optional

pkgs/development/libraries/groonga-normalizer-mysql/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libgroonga }:
+
+stdenv.mkDerivation rec {
+  name = "groonga-normalizer-mysql-${version}";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "groonga";
+    repo = "groonga-normalizer-mysql";
+    rev = "v${version}";
+    sha256 = "1s7yzggp25jajl8i28da2bz0nys90llwg5gvpyhsdqv3w3n1dysy";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ libgroonga ];
+
+  preConfigure = ''
+    export GROONGA_PLUGINS_DIR="$out/lib/groonga/plugins"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/groonga/groonga-normalizer-mysql;
+    description = "provides MySQL compatible normalizers and a custom normalizers to Groonga";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}

pkgs/development/libraries/libdbi-drivers/default.nix

@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
     "--with-dbi-libdir=${libdbi}/lib"
   ] ++ optionals (libmysql != null) [
     "--with-mysql"
-    "--with-mysql-incdir=${libmysql}/include/mysql"
-    "--with-mysql-libdir=${libmysql}/lib/mysql"
+    "--with-mysql-incdir=${libmysql.dev}/include/mysql"
+    "--with-mysql-libdir=${libmysql.lib}/lib"
   ] ++ optionals (postgresql != null) [
     "--with-pgsql"
     "--with-pgsql_incdir=${postgresql}/include"

pkgs/development/libraries/librdf/redland.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, openssl, libxslt, perl
 , curl, pcre, libxml2, librdf_rasqal
-, mysql, withMysql ? false
+, libmysql, withMysql ? false
 , postgresql, withPostgresql ? false
 , sqlite, withSqlite ? true
 , db, withBdb ? false
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl pkgconfig ];
 
   buildInputs = [ openssl libxslt curl pcre libxml2 ]
-    ++ stdenv.lib.optional withMysql mysql
+    ++ stdenv.lib.optional withMysql libmysql
     ++ stdenv.lib.optional withSqlite sqlite
     ++ stdenv.lib.optional withPostgresql postgresql
     ++ stdenv.lib.optional withBdb db;

pkgs/development/libraries/opendbx/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
+{ stdenv, fetchurl, readline, libmysql, postgresql, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "opendbx-1.4.6";
@@ -9,10 +9,9 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    export CPPFLAGS="-I${mysql.lib}/include/mysql"
-    export LDFLAGS="-L${mysql.lib}/lib/mysql"
+    export CPPFLAGS="-I${libmysql.dev}/include/mysql"
     configureFlagsArray=(--with-backends="mysql pgsql sqlite3")
   '';
 
-  buildInputs = [ readline mysql.lib postgresql sqlite ];
+  buildInputs = [ readline libmysql postgresql sqlite ];
 }

pkgs/development/libraries/qt-3/default.nix

@@ -5,7 +5,7 @@
 , xineramaSupport ? true, libXinerama ? null
 , cursorSupport ? true, libXcursor ? null
 , threadSupport ? true
-, mysqlSupport ? false, mysql ? null
+, mysqlSupport ? false, libmysql ? null
 , openglSupport ? false, mesa ? null, libXmu ? null
 , x11, xextproto, zlib, libjpeg, libpng, which
 }:
@@ -14,7 +14,7 @@ assert xftSupport -> libXft != null;
 assert xrenderSupport -> xftSupport && libXrender != null;
 assert xrandrSupport -> libXrandr != null && randrproto != null;
 assert cursorSupport -> libXcursor != null;
-assert mysqlSupport -> mysql != null;
+assert mysqlSupport -> libmysql != null;
 assert openglSupport -> mesa != null && libXmu != null;
 
 stdenv.mkDerivation {
@@ -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}/lib/mysql -I${mysql.lib}/include/mysql" else ""}
+    ${if mysqlSupport then "-qt-sql-mysql -L${libmysql.lib}/lib -I${libmysql.dev}/include/mysql" else ""}
     ${if xftSupport then "-xft
       -L${libXft}/lib -I${libXft}/include
       -L${libXft.freetype}/lib -I${libXft.freetype}/include

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

@@ -2,7 +2,7 @@
 , libXrender, libXinerama, libXcursor, libXmu, libXv, libXext
 , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
 , libmng, which, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig
-, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
+, libtiff, glib, icu, libmysql, postgresql, sqlite, perl, coreutils, libXi
 , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst_plugins_base
 , buildWebkit ? stdenv.isLinux
 , flashplayerFix ? false, gdk_pixbuf
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
       -opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig
       -qdbus -${if cups == null then "no-" else ""}cups -glib -dbus-linked -openssl-linked
 
-      ${if mysql != null then "-plugin" else "-no"}-sql-mysql -system-sqlite
+      ${if libmysql != null then "-plugin" else "-no"}-sql-mysql -system-sqlite
 
       -exceptions -xmlpatterns
 
@@ -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.lib postgresql sqlite libjpeg libmng libtiff icu ]
+      libmysql postgresql sqlite libjpeg libmng libtiff icu ]
     ++ optionals gtkStyle [ gtk gdk_pixbuf ];
 
   nativeBuildInputs = [ perl pkgconfig which ];