diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-12-04 10:59:00 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2021-12-04 10:59:46 +0000 |
| commit | 05d223f53e416f734bc8796c3690aef70402a9b3 (patch) | |
| tree | fd2ec6010b38b840a74459226012cd1243bc681d /pkgs/development/ruby-modules | |
| parent | bb9bd465b625bfc971908c5d3d84ce517e1c0691 (diff) | |
| download | nixpkgs-05d223f53e416f734bc8796c3690aef70402a9b3.tar nixpkgs-05d223f53e416f734bc8796c3690aef70402a9b3.tar.gz nixpkgs-05d223f53e416f734bc8796c3690aef70402a9b3.tar.bz2 nixpkgs-05d223f53e416f734bc8796c3690aef70402a9b3.tar.lz nixpkgs-05d223f53e416f734bc8796c3690aef70402a9b3.tar.xz nixpkgs-05d223f53e416f734bc8796c3690aef70402a9b3.tar.zst nixpkgs-05d223f53e416f734bc8796c3690aef70402a9b3.zip | |
rubyPackages.zookeeper: drop outdated patch
Without the change build fails as:
patch -p0 < patches/zkc-3.4.5-gcc-8.patch 2>&1
patching file zkc-3.4.5/c/src/zookeeper.c
Hunk #1 FAILED at 3418.
1 out of 1 hunk FAILED -- saving rejects to file zkc-3.4.5/c/src/zookeeper.c.rej
Diffstat (limited to 'pkgs/development/ruby-modules')
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/zookeeper-ftbfs-with-gcc-8.patch | 11 |
2 files changed, 0 insertions, 17 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index f389ebb4578..193db8bacb7 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -676,11 +676,5 @@ in zookeeper = attrs: { buildInputs = lib.optionals stdenv.isDarwin [ 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' - " - ''; }; } diff --git a/pkgs/development/ruby-modules/gem-config/zookeeper-ftbfs-with-gcc-8.patch b/pkgs/development/ruby-modules/gem-config/zookeeper-ftbfs-with-gcc-8.patch deleted file mode 100644 index badb76ccfd2..00000000000 --- a/pkgs/development/ruby-modules/gem-config/zookeeper-ftbfs-with-gcc-8.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 |