diff options
Diffstat (limited to 'pkgs/development/ruby-modules/gem-config/default.nix')
-rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 9a02f4f374a..157e15e375f 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, 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 @@ -507,7 +507,10 @@ in substituteInPlace lib/sassc/native.rb \ --replace 'gem_root = spec.gem_dir' 'gem_root = File.join(__dir__, "../../")' ''; - }; + } // (if stdenv.isDarwin then { + # https://github.com/NixOS/nixpkgs/issues/19098 + buildFlags = "--disable-lto"; + } else {}); scrypt = attrs: if stdenv.isDarwin then { @@ -613,5 +616,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' + " + ''; }; } |