about summary refs log tree commit diff
path: root/pkgs/applications/radio/tlf
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2021-12-06 10:34:19 +0000
committerSergei Trofimovich <slyich@gmail.com>2021-12-06 10:36:16 +0000
commit20564a88d283fd77e83265de050e6f6a6d8af577 (patch)
tree0b9ec46e293aba12fb420e558ea5ce33516ebf4a /pkgs/applications/radio/tlf
parente98afa97d3554e00661e436ba5ab5938d40bc761 (diff)
downloadnixlib-20564a88d283fd77e83265de050e6f6a6d8af577.tar
nixlib-20564a88d283fd77e83265de050e6f6a6d8af577.tar.gz
nixlib-20564a88d283fd77e83265de050e6f6a6d8af577.tar.bz2
nixlib-20564a88d283fd77e83265de050e6f6a6d8af577.tar.lz
nixlib-20564a88d283fd77e83265de050e6f6a6d8af577.tar.xz
nixlib-20564a88d283fd77e83265de050e6f6a6d8af577.tar.zst
nixlib-20564a88d283fd77e83265de050e6f6a6d8af577.zip
tlf: upstream fix for ncurses-6.3
Without the change the build fails as:

    audio.c:50:2: error: format not a string literal and no format arguments [-Werror=format-security]
       50 |  mvprintw(j, 0, backgrnd_str);
          |  ^~~~~~~~
Diffstat (limited to 'pkgs/applications/radio/tlf')
-rw-r--r--pkgs/applications/radio/tlf/default.nix14
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix
index 91a07496ce9f..f988957066e9 100644
--- a/pkgs/applications/radio/tlf/default.nix
+++ b/pkgs/applications/radio/tlf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkg-config, glib
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, autoconf, automake, pkg-config, glib
 , perl, ncurses5, hamlib, xmlrpc_c }:
 
 stdenv.mkDerivation rec {
@@ -12,6 +12,18 @@ stdenv.mkDerivation rec {
     sha256 = "1xpgs4k27pjd9mianfknknp6mf34365bcp96wrv5xh4dhph573rj";
   };
 
+  patches = [
+    # Pull upstream fix for ncurses-6.3:
+    #   https://github.com/Tlf/tlf/pull/282
+    # We use Debian's patch as upstream fixes don't apply as is due to
+    # related code changes. The change will be a part of 1.4.2 release.
+    (fetchpatch {
+      name = "ncurses-6.3.patch";
+      url = "https://salsa.debian.org/debian-hamradio-team/tlf/-/raw/5a2d79fc35bde97f653b1373fd970d41fe01a3ec/debian/patches/warnings-as-errors.patch?inline=false";
+      sha256 = "1zi1dd4vqkgl2pg29lnhj91ralqg58gmkzq9fkcx0dyakbjm6070";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook autoconf automake pkg-config perl ];
   buildInputs = [ glib ncurses5 hamlib xmlrpc_c ];