From d375e8d1be598ecbedc53cc0411f3e359a3628c6 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 31 Jan 2024 21:47:22 +0200
Subject: [PATCH 1/3] ncurses: support termlib

---
 pkgs/development/libraries/ncurses/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 2a4e89d7f3df..0ee09d2416cd 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -9,6 +9,7 @@
 , enableStatic ? stdenv.hostPlatform.isStatic
 , withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt
 , mouseSupport ? false, gpm
+, withTermlib ? false
 , unicodeSupport ? true
 , testers
 , binlore
@@ -38,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional (!withCxx) "--without-cxx"
     ++ lib.optional (abiVersion == "5") "--with-abi-version=5"
     ++ lib.optional stdenv.hostPlatform.isNetBSD "--enable-rpath"
+    ++ lib.optional withTermlib "--with-termlib"
     ++ lib.optionals stdenv.hostPlatform.isWindows [
       "--enable-sp-funcs"
       "--enable-term-driver"

From 34b5fb261d838ef4010efa6c5a4ad0882e1c49ac Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 31 Jan 2024 21:47:53 +0200
Subject: [PATCH 2/3] libtinfo: init at 6.4

---
 pkgs/by-name/li/libtinfo/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 pkgs/by-name/li/libtinfo/package.nix

diff --git a/pkgs/by-name/li/libtinfo/package.nix b/pkgs/by-name/li/libtinfo/package.nix
new file mode 100644
index 000000000000..fa4652da0ab6
--- /dev/null
+++ b/pkgs/by-name/li/libtinfo/package.nix
@@ -0,0 +1,8 @@
+{
+  ncurses,
+}:
+
+ncurses.override {
+  unicodeSupport = false;
+  withTermlib = true;
+}

From c3b147d34ae9eb7032c2bb644606be3d0dce7020 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 31 Jan 2024 21:49:21 +0200
Subject: [PATCH 3/3] tests.buildFHSEnv.libtinfo: simplify using libtinfo

---
 pkgs/test/buildFHSEnv/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/test/buildFHSEnv/default.nix b/pkgs/test/buildFHSEnv/default.nix
index 0a355e1aeeac..5ded03ea1f99 100644
--- a/pkgs/test/buildFHSEnv/default.nix
+++ b/pkgs/test/buildFHSEnv/default.nix
@@ -63,13 +63,8 @@ in {
   libtinfo = makeSharedObjectTest (getSharedObjectFromDebian "libedit.so.2.0.70" (fetchurl {
     url = "mirror://debian/pool/main/libe/libedit/libedit2_3.1-20221030-2_amd64.deb";
     hash = "sha256-HPFKvycW0yedsS0GV6VzfPcAdKHnHTvfcyBmJePInOY=";
-  })) (p: let
-    ncurses' = p.ncurses.overrideAttrs (old: {
-      configureFlags = old.configureFlags ++ [ "--with-termlib" ];
-      postFixup = "";
-    });
-  in [
-    (ncurses'.override { unicodeSupport = false; })
+  })) (p: [
+    p.libtinfo
     p.libbsd
   ]);