about summary refs log tree commit diff
path: root/pkgs/development/libraries/libcdio
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2021-11-01 08:07:37 +0000
committerSergei Trofimovich <slyich@gmail.com>2021-11-01 08:08:20 +0000
commit475cc96c02dae9d46453b76e765ff1c2287ec047 (patch)
tree1d38d782ebf4f72e346e53654fd51b2c3b07d4e2 /pkgs/development/libraries/libcdio
parentfdcee2eb3b0167294ca7d15929ac5284247ac892 (diff)
libcdio: fix build against upcoming ncurses-6.3
On ncurses-6.3 with extra printf() annotations gcc now detects
use of user input in place of format strings:

    cdda-player.c:1032:31:
      error: format not a string literal and no format arguments [-Werror=format-security]
     1032 |         mvprintw(i_line++, 0, line);
          |                               ^~~~
Diffstat (limited to 'pkgs/development/libraries/libcdio')
-rw-r--r--pkgs/development/libraries/libcdio/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix
index cfe796b14d062..71a953b83904f 100644
--- a/pkgs/development/libraries/libcdio/default.nix
+++ b/pkgs/development/libraries/libcdio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libcddb, pkg-config, ncurses, help2man, libiconv, Carbon, IOKit }:
+{ lib, stdenv, fetchurl, fetchpatch, libcddb, pkg-config, ncurses, help2man, libiconv, Carbon, IOKit }:
 
 stdenv.mkDerivation rec {
   name = "libcdio-2.1.0";
@@ -8,6 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0avi6apv5ydjy6b9c3z9a46rvp5i57qyr09vr7x4nndxkmcfjl45";
   };
 
+  patches = [
+    # pull pending upstream patch to fix build on ncurses-6.3:
+    #  https://savannah.gnu.org/patch/index.php?10130
+    (fetchpatch {
+      name = "ncurses-6.3.patch";
+      url = "https://savannah.gnu.org/patch/download.php?file_id=52179";
+      sha256 = "1v15gxhpi4bgcr12pb3d9c3hiwj0drvc832vic7sham34lhjmcbb";
+    })
+  ];
+
   postPatch = ''
     patchShebangs .
   '';