ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-13 09:17:07 +03:00
Code Issues Projects Releases Wiki Activity

treewide: use libtinfo.so.5 where needed

Browse Source 
This was originally added in

https://github.com/NixOS/nixpkgs/pull/21350

best to use this name for clarity.
This commit is contained in:
Matthew Bauer 2019-09-18 13:57:20 -04:00
parent 2c32f91bfc
commit 4c85abae94
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/jetbrains/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, callPackage, fetchurl { lib, stdenv, callPackage, fetchurl
, python , python
, jdk, cmake, libxml2, zlib, python3, ncurses , jdk, cmake, libxml2, zlib, python3, ncurses5
}: }:
with stdenv.lib; with stdenv.lib;
@ -34,7 +34,7 @@ let
lldbLibPath=$out/clion-${version}/bin/lldb/linux/lib lldbLibPath=$out/clion-${version}/bin/lldb/linux/lib
interp="$(cat $NIX_CC/nix-support/dynamic-linker)" 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 \ patchelf --set-interpreter $interp \
--set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \ --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \

8
pkgs/applications/radio/tlf/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig, glib { stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig, glib
, perl, ncurses, hamlib, xmlrpc_c }: , perl, ncurses5, hamlib, xmlrpc_c }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tlf"; pname = "tlf";
@ -13,15 +13,13 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ autoreconfHook autoconf automake pkgconfig perl ]; nativeBuildInputs = [ autoreconfHook autoconf automake pkgconfig perl ];
buildInputs = [ glib ncurses hamlib xmlrpc_c ]; buildInputs = [ glib ncurses5 hamlib xmlrpc_c ];
configureFlags = [ "--enable-hamlib" "--enable-fldigi-xmlrpc" ]; configureFlags = [ "--enable-hamlib" "--enable-fldigi-xmlrpc" ];
postInstall = '' postInstall = ''
mkdir -p $out/lib mkdir -p $out/lib
ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5
# Hack around lack of libtinfo in NixOS
ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

3
pkgs/applications/science/logic/saw-tools/default.nix
View File

@ -34,8 +34,7 @@ stdenv.mkDerivation {
mv bin $out/bin mv bin $out/bin
mv doc $out/share mv doc $out/share
# Hack around lack of libtinfo in NixOS ln -s ${ncurses.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5
ln -s ${ncurses.out}/lib/libncursesw.so.5 $out/lib/libtinfo.so.5
ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0 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. # Add a clang symlink for easy building with a suitable compiler.

7
pkgs/applications/science/programming/fdr/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, qtbase, qtx11extras, ncurses, xorg, zlib, python27Packages}: {stdenv, fetchurl, qtbase, qtx11extras, ncurses5, xorg, zlib, python27Packages}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "fdr-4.2.3"; name = "fdr-4.2.3";
src = fetchurl { src = fetchurl {
@ -11,7 +11,7 @@ stdenv.mkDerivation {
python27Packages.python python27Packages.python
qtbase qtbase
qtx11extras qtx11extras
ncurses ncurses5
xorg.libX11 xorg.libX11
xorg.libXft xorg.libXft
zlib zlib
@ -26,8 +26,7 @@ stdenv.mkDerivation {
rm -r lib/qt_plugins rm -r lib/qt_plugins
cp -r * "$out" cp -r * "$out"
# Hack around lack of libtinfo in NixOS ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5
ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5
ln -s ${qtbase.bin}/${qtbase.qtPluginPrefix} $out/lib/qt_plugins ln -s ${qtbase.bin}/${qtbase.qtPluginPrefix} $out/lib/qt_plugins
ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1 ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1

2
pkgs/development/arduino/arduino-core/default.nix
View File

@ -200,7 +200,7 @@ stdenv.mkDerivation rec {
# avrdude_bin is linked against libtinfo.so.5 # avrdude_bin is linked against libtinfo.so.5
mkdir $out/lib/ 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 '' ${stdenv.lib.optionalString withTeensyduino ''
# Patch the Teensy loader binary # Patch the Teensy loader binary