From 4a0fbcbd138ae1430df231fe134311a0ac62acf1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 4 Dec 2021 18:52:02 +0000 Subject: [PATCH] liboping: fix format arguments for printf() Without the change build fails on `ncurses-6.3` as: oping.c:1601:38: error: too many arguments for format [-Werror=format-extra-args] 1601 | HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i ", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- pkgs/development/libraries/liboping/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index e730540cf12c..9a44e84b136f 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses ? null, perl ? null, lib }: +{ stdenv, fetchurl, fetchpatch, ncurses ? null, perl ? null, lib }: stdenv.mkDerivation rec { pname = "liboping"; @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { # Add support for ncurses-6.3. A backport of patch pending upstream # inclusion: https://github.com/octo/liboping/pull/61 ./ncurses-6.3.patch + + # Pull pending fix for format arguments mismatch: + # https://github.com/octo/liboping/pull/60 + (fetchpatch { + name = "format-args.patch"; + url = "https://github.com/octo/liboping/commit/7a50e33f2a686564aa43e4920141e6f64e042df1.patch"; + sha256 = "118fl3k84m3iqwfp49g5qil4lw1gcznzmyxnfna0h7za2nm50cxw"; + }) ]; NIX_CFLAGS_COMPILE = lib.optionalString