summary refs log tree commit diff
path: root/pkgs/development/libraries/ncurses/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-08-21 15:36:02 +0200
committerVladimír Čunát <vcunat@gmail.com>2018-08-21 15:36:02 +0200
commit765d695b89fac76f84b1ff9a1a7737753b2d8530 (patch)
treec130c7dc4d7d05e0bcea14be12b7a9dcef2cc642 /pkgs/development/libraries/ncurses/default.nix
parent690a8017de9f9e9bed8609c1798d6d4309d9794a (diff)
parentcad8fc3447372043c4a098a3104a03f4990058e4 (diff)
downloadnixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.gz
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.bz2
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.lz
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.xz
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.zst
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.zip
Merge branch 'staging-next'
Security fixes for a few packages are included.
Diffstat (limited to 'pkgs/development/libraries/ncurses/default.nix')
-rw-r--r--pkgs/development/libraries/ncurses/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 0cb69f937564..861b387a993a 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
     sha256 = "05qdmbmrrn88ii9f66rkcmcyzp1kb1ymkx7g040lfkd1nkp7w1da";
   };
 
-  patches = lib.optional (!stdenv.cc.isClang) ./clang.patch;
+  # The patch st-0.7.patch needs to be removed, if ncurses is upgraded in the future.
+  # It is necessary for the 6.1 version of ncurses.
+  patches = [ ./st-0.7.patch ] ++ lib.optional (!stdenv.cc.isClang) ./clang.patch;
 
   outputs = [ "out" "dev" "man" ];
   setOutputFlags = false; # some aren't supported