From 5775813f70bfd509eb1cb3896e1574c3bbbfa6b3 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 26 Nov 2022 10:59:10 +0000 Subject: [PATCH] httping: pull upstream fix for darwin Without the change build fails as: clang -Wall -W -Wextra -pedantic -D_FORTIFY_SOURCE=2 -DVERSION=\"2.9\" -DLOCALEDIR=\"/usr/share/locale\" -DNC -DFW -D_DEBUG -ggdb -c -o nc.o nc.c In file included from nc.c:22: ./utils.h:19:15: error: unknown type name 'useconds_t' void myusleep(useconds_t v); ^ make: *** [: nc.o] Error 1 Closes: https://github.com/NixOS/nixpkgs/issues/202946 --- pkgs/tools/networking/httping/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index 195f739aa5a..5a3b8e76c27 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , fftw ? null , gettext , libintl @@ -19,6 +20,16 @@ stdenv.mkDerivation rec { hash = "sha256-aExTXXtW03UKMuMjTMx1k/MUpcRMh1PdSPkDGH+Od70="; }; + patches = [ + # Pull upstream fix for missing + # https://github.com/folkertvanheusden/HTTPing/pull/8 + (fetchpatch { + name = "add-unistd.patch"; + url = "https://github.com/folkertvanheusden/HTTPing/commit/aad3c275686344fe9a235faeac4ee3832f3aa8d5.patch"; + hash = "sha256-bz3AMQTSfSTwUyf9WbkAFWVmFo06ei+Qd55x+RRDREY="; + }) + ]; + nativeBuildInputs = [ gettext ];