diff options
author | William A. Kennington III <william@wkennington.com> | 2015-04-01 16:39:50 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-04-01 16:46:53 -0700 |
commit | a604b4248054b31bbdfd1c96fdf591793859abc5 (patch) | |
tree | a0ecfcb0fc82ca7a1fbe2776764ccb57fda40e87 /pkgs/applications/misc | |
parent | bc7b39784ac6779820ac2bfefc1f7a94ba3ab310 (diff) |
mysql: Use libs in place of the binary mysql
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/mysql-workbench/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/stardict/stardict.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index efe8785654a9f..4f2c2fba97c4a 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 d4c41edde30ed..600642f488acf 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' |