public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gem-config: fix zookeeper for gcc-8 (#68642)

Browse Source
This commit is contained in:
Michael Fellinger 2019-09-13 16:01:13 +02:00 committed by zimbatm
parent 08d556c0e8
commit 13866ed4cf
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -19,7 +19,7 @@
{ lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
, libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
, pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi
, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
@ -613,5 +613,11 @@ in
zookeeper = attrs: { zookeeper = attrs: {
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
dontBuild = false;
postPatch = ''
sed -i ext/extconf.rb -e "4a \
FileUtils.cp '${./zookeeper-ftbfs-with-gcc-8.patch}', 'patches/zkc-3.4.5-gcc-8.patch'
"
'';
}; };
} }

11
pkgs/development/ruby-modules/gem-config/zookeeper-ftbfs-with-gcc-8.patch Normal file
View File

@ -0,0 +1,11 @@
--- zkc-3.4.5/c/src/zookeeper.c 2019-09-13 12:05:20.647034862 +0200
+++ zkc-3.4.5/c/src/zookeeper.c 2019-09-13 12:05:49.125360269 +0200
@@ -3418,7 +3418,7 @@
static const char* format_endpoint_info(const struct sockaddr_storage* ep)
{
- static char buf[128];
+ static char buf[128 + 6]; // include space for the port :xxxxxx
char addrstr[128];
void *inaddr;
#ifdef WIN32