about summary refs log tree commit diff
path: root/pkgs/development/ruby-modules/gem-config
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-09-22 09:38:09 +0200
committerVladimír Čunát <v@cunat.cz>2019-09-22 09:38:09 +0200
commit22a216849bf82ec65e3de86b7ea30e9c6b11efa4 (patch)
tree8b425b2c80cb46a8f7a8d72beeb66777506d7bd6 /pkgs/development/ruby-modules/gem-config
parent415b29939b01ca13f4667d5ffa8ede8ed262b0ee (diff)
downloadnixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar
nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.gz
nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.bz2
nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.lz
nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.xz
nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.zst
nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.zip
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c079de430fa528f688ddac781bcef16.
Diffstat (limited to 'pkgs/development/ruby-modules/gem-config')
-rw-r--r--pkgs/development/ruby-modules/gem-config/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index a03e40e8097c..157e15e375f6 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -20,7 +20,7 @@
 { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
 , pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi
-, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
+, cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl
 , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
 , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
 , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
@@ -349,11 +349,11 @@ in
   };
 
   mysql = attrs: {
-    buildInputs = [ mysql.connector-c zlib openssl ];
+    buildInputs = [ libmysqlclient zlib openssl ];
   };
 
   mysql2 = attrs: {
-    buildInputs = [ mysql.connector-c zlib openssl ];
+    buildInputs = [ libmysqlclient zlib openssl ];
   };
 
   ncursesw = attrs: {