summary refs log tree commit diff
path: root/pkgs/development/ruby-modules/gem-config/default.nix
diff options
context:
space:
mode:
authorMichael Fellinger <michael.fellinger@iohk.io>2019-09-13 16:01:13 +0200
committerzimbatm <zimbatm@zimbatm.com>2019-09-13 14:01:13 +0000
commit13866ed4cfb5aa80b366ee7848b3ce179f33d3d3 (patch)
tree506dfcda8b350a607bec8ce975b8d3f6d3650c52 /pkgs/development/ruby-modules/gem-config/default.nix
parent08d556c0e8590a2aabd321c3b7b4f40ae6ea1f92 (diff)
downloadnixpkgs-13866ed4cfb5aa80b366ee7848b3ce179f33d3d3.tar
nixpkgs-13866ed4cfb5aa80b366ee7848b3ce179f33d3d3.tar.gz
nixpkgs-13866ed4cfb5aa80b366ee7848b3ce179f33d3d3.tar.bz2
nixpkgs-13866ed4cfb5aa80b366ee7848b3ce179f33d3d3.tar.lz
nixpkgs-13866ed4cfb5aa80b366ee7848b3ce179f33d3d3.tar.xz
nixpkgs-13866ed4cfb5aa80b366ee7848b3ce179f33d3d3.tar.zst
nixpkgs-13866ed4cfb5aa80b366ee7848b3ce179f33d3d3.zip
gem-config: fix zookeeper for gcc-8 (#68642)
Diffstat (limited to 'pkgs/development/ruby-modules/gem-config/default.nix')
-rw-r--r--pkgs/development/ruby-modules/gem-config/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 642d5515cb8..e9f57d2b85f 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -19,7 +19,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, fetchpatch, tzdata, icu, libffi
+, pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi
 , 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
@@ -613,5 +613,11 @@ in
 
   zookeeper = attrs: {
     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'
+      "
+    '';
   };
 }