diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-09-18 13:57:20 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-09-18 13:57:20 -0400 |
| commit | 4c85abae94b0a55ff76387c1f1793370a170dda8 (patch) | |
| tree | 8bf2eac091b19a5b1ddc4b811ee4ed6523ad5870 /pkgs/applications/science | |
| parent | 2c32f91bfc3d50175dd1f1eb87bf34626b7e8ab5 (diff) | |
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.
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/logic/saw-tools/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/science/programming/fdr/default.nix | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index d357bef2c7a..c4041281054 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -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. diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index 3bfb70f5ce8..2c0bb84c801 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -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 |