diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-09-09 06:01:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-09 06:01:04 +0000 |
| commit | 77893d86c21d9ad6c4c95ec8fbc0f8377f0d2597 (patch) | |
| tree | 43c7fc7e9ddbb3f193fa538266f86751b550cc64 /pkgs/development/ruby-modules | |
| parent | 8cd1da23628a826e2b461f91c229d785120edc3b (diff) | |
| parent | 7e10715778240535cc6e4db19bcdfb7c89378b71 (diff) | |
| download | nixpkgs-77893d86c21d9ad6c4c95ec8fbc0f8377f0d2597.tar nixpkgs-77893d86c21d9ad6c4c95ec8fbc0f8377f0d2597.tar.gz nixpkgs-77893d86c21d9ad6c4c95ec8fbc0f8377f0d2597.tar.bz2 nixpkgs-77893d86c21d9ad6c4c95ec8fbc0f8377f0d2597.tar.lz nixpkgs-77893d86c21d9ad6c4c95ec8fbc0f8377f0d2597.tar.xz nixpkgs-77893d86c21d9ad6c4c95ec8fbc0f8377f0d2597.tar.zst nixpkgs-77893d86c21d9ad6c4c95ec8fbc0f8377f0d2597.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/ruby-modules')
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 8111f6e53cd..d06b362e2ce 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -623,13 +623,6 @@ in buildInputs = [ taglib ]; }; - thrift = attrs: { - # See: https://stackoverflow.com/questions/36378190/cant-install-thrift-gem-on-os-x-el-capitan/36523125#36523125 - # Note that thrift-0.8.0 is a dependency of fluent-plugin-scribe which is a dependency of fluentd. - buildFlags = lib.optional (stdenv.isDarwin && lib.versionOlder attrs.version "0.9.2.0") - "--with-cppflags=\"-D_FORTIFY_SOURCE=0 -Wno-macro-redefined -Wno-shift-negative-value\""; - }; - timfel-krb5-auth = attrs: { buildInputs = [ libkrb5 ]; }; |