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; +} 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" 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 ]);