git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #60693 from petabyteboy/feature/ruby-gems

gem-config: add idn-ruby, rpam2, cld3

commit85d160e24b1cf58557d4b0f995f2d5fb75ddfb5b authorAlyssa Ross <hi@alyssa.is> dateThu 2 May 2019, 04:13 (8 years ago) parent5aae21dbd81420
1 file changed+14−1
pkgs/development/ruby-modules/gem-config/default.nix+14−1
pkgs/development/ruby-modules/gem-config/default.nix+14−1
@@ -23,7 +23,7 @@
2323, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
2424, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
2525, cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx
26−, file, libvirt, glib, vips, taglib, libopus
26+, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf
2727, libselinux ? null, libsepol ? null
2828}@args:
2929
@@ -79,6 +79,11 @@ in
7979 buildInputs = [ which icu zlib ];
8080 };
8181
82+ cld3 = attrs: {
83+ nativeBuildInputs = [ pkgconfig ];
84+ buildInputs = [ protobuf ];
85+ };
86+
8287 curb = attrs: {
8388 buildInputs = [ curl ];
8489 };
@@ -201,6 +206,10 @@ in
201206 buildFlags = lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";
202207 };
203208
209+ idn-ruby = attrs: {
210+ buildInputs = [ libidn ];
211+ };
212+
204213 # disable bundle install as it can't install anything in addition to what is
205214 # specified in pkgs/applications/misc/jekyll/Gemfile anyway. Also do chmod_R
206215 # to compensate for read-only files in site_template in nix store.
@@ -340,6 +349,10 @@ in
340349 buildInputs = [ imagemagick which ];
341350 };
342351
352+ rpam2 = attrs: {
353+ buildInputs = [ linux-pam ];
354+ };
355+
343356 ruby-libvirt = attrs: {
344357 buildInputs = [ libvirt pkgconfig ];
345358 buildFlags = [