Merge pull request #60693 from petabyteboy/feature/ruby-gems

gem-config: add idn-ruby, rpam2, cld3
This commit is contained in:
Alyssa Ross 2019-05-02 04:13:40 +00:00 committed by GitHub
commit 85d160e24b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -23,7 +23,7 @@
, cmake, libssh2, openssl, mysql, 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
, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf
, libselinux ? null, libsepol ? null
}@args:
@ -79,6 +79,11 @@ in
buildInputs = [ which icu zlib ];
};
cld3 = attrs: {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ protobuf ];
};
curb = attrs: {
buildInputs = [ curl ];
};
@ -201,6 +206,10 @@ in
buildFlags = lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";
};
idn-ruby = attrs: {
buildInputs = [ libidn ];
};
# disable bundle install as it can't install anything in addition to what is
# specified in pkgs/applications/misc/jekyll/Gemfile anyway. Also do chmod_R
# to compensate for read-only files in site_template in nix store.
@ -340,6 +349,10 @@ in
buildInputs = [ imagemagick which ];
};
rpam2 = attrs: {
buildInputs = [ linux-pam ];
};
ruby-libvirt = attrs: {
buildInputs = [ libvirt pkgconfig ];
buildFlags = [