treewide: use libtinfo.so.5 where needed
This was originally added in https://github.com/NixOS/nixpkgs/pull/21350 best to use this name for clarity.
This commit is contained in:
parent
2c32f91bfc
commit
4c85abae94
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, callPackage, fetchurl
|
||||
, python
|
||||
, jdk, cmake, libxml2, zlib, python3, ncurses
|
||||
, jdk, cmake, libxml2, zlib, python3, ncurses5
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
@ -34,7 +34,7 @@ let
|
|||
|
||||
lldbLibPath=$out/clion-${version}/bin/lldb/linux/lib
|
||||
interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
|
||||
ln -s ${ncurses.out}/lib/libncurses.so $lldbLibPath/libtinfo.so.5
|
||||
ln -s ${ncurses5.out}/lib/libtinfo.so.5 $lldbLibPath/libtinfo.so.5
|
||||
|
||||
patchelf --set-interpreter $interp \
|
||||
--set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig, glib
|
||||
, perl, ncurses, hamlib, xmlrpc_c }:
|
||||
, perl, ncurses5, hamlib, xmlrpc_c }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tlf";
|
||||
|
@ -13,15 +13,13 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook autoconf automake pkgconfig perl ];
|
||||
buildInputs = [ glib ncurses hamlib xmlrpc_c ];
|
||||
buildInputs = [ glib ncurses5 hamlib xmlrpc_c ];
|
||||
|
||||
configureFlags = [ "--enable-hamlib" "--enable-fldigi-xmlrpc" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib
|
||||
|
||||
# Hack around lack of libtinfo in NixOS
|
||||
ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5
|
||||
ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
@ -34,8 +34,7 @@ stdenv.mkDerivation {
|
|||
mv bin $out/bin
|
||||
mv doc $out/share
|
||||
|
||||
# Hack around lack of libtinfo in NixOS
|
||||
ln -s ${ncurses.out}/lib/libncursesw.so.5 $out/lib/libtinfo.so.5
|
||||
ln -s ${ncurses.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5
|
||||
ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0
|
||||
|
||||
# Add a clang symlink for easy building with a suitable compiler.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, qtbase, qtx11extras, ncurses, xorg, zlib, python27Packages}:
|
||||
{stdenv, fetchurl, qtbase, qtx11extras, ncurses5, xorg, zlib, python27Packages}:
|
||||
stdenv.mkDerivation {
|
||||
name = "fdr-4.2.3";
|
||||
src = fetchurl {
|
||||
|
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
|||
python27Packages.python
|
||||
qtbase
|
||||
qtx11extras
|
||||
ncurses
|
||||
ncurses5
|
||||
xorg.libX11
|
||||
xorg.libXft
|
||||
zlib
|
||||
|
@ -26,8 +26,7 @@ stdenv.mkDerivation {
|
|||
rm -r lib/qt_plugins
|
||||
|
||||
cp -r * "$out"
|
||||
# Hack around lack of libtinfo in NixOS
|
||||
ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5
|
||||
ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5
|
||||
ln -s ${qtbase.bin}/${qtbase.qtPluginPrefix} $out/lib/qt_plugins
|
||||
ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1
|
||||
|
||||
|
|
|
@ -200,7 +200,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# avrdude_bin is linked against libtinfo.so.5
|
||||
mkdir $out/lib/
|
||||
ln -s ${lib.makeLibraryPath [ncurses5]}/libncursesw.so.5 $out/lib/libtinfo.so.5
|
||||
ln -s ${lib.makeLibraryPath [ncurses5]}/libtinfo.so.5 $out/lib/libtinfo.so.5
|
||||
|
||||
${stdenv.lib.optionalString withTeensyduino ''
|
||||
# Patch the Teensy loader binary
|
||||
|
|
Loading…
Reference in a new issue