Merge pull request #148623 from trofi/fix-liboping-format

This commit is contained in:
Sandro 2021-12-05 01:34:28 +01:00 committed by GitHub
commit 840d3da365
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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