summary refs log tree commit diff
path: root/pkgs/development/libraries/ncurses
diff options
context:
space:
mode:
authorSophie Taylor <sophie@traumapony.org>2016-12-23 13:18:58 +1000
committerGitHub <noreply@github.com>2016-12-23 13:18:58 +1000
commitc826ec60909a00b6093b708aa907f7f1dd018558 (patch)
tree03050544311a9253fa6742b9aeb094092207ded9 /pkgs/development/libraries/ncurses
parent41652f8ce58680a5cb21540677a27854ea668557 (diff)
downloadnixlib-c826ec60909a00b6093b708aa907f7f1dd018558.tar
nixlib-c826ec60909a00b6093b708aa907f7f1dd018558.tar.gz
nixlib-c826ec60909a00b6093b708aa907f7f1dd018558.tar.bz2
nixlib-c826ec60909a00b6093b708aa907f7f1dd018558.tar.lz
nixlib-c826ec60909a00b6093b708aa907f7f1dd018558.tar.xz
nixlib-c826ec60909a00b6093b708aa907f7f1dd018558.tar.zst
nixlib-c826ec60909a00b6093b708aa907f7f1dd018558.zip
ncurses: Fix libtinfo for crossplatform
Diffstat (limited to 'pkgs/development/libraries/ncurses')
-rw-r--r--pkgs/development/libraries/ncurses/default.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 302c86816770..c7048cfa8fec 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -91,6 +91,9 @@ stdenv.mkDerivation rec {
           if [ -e "$out/lib/lib''${library}$suffix.$dylibtype" ]; then
             ln -svf lib''${library}$suffix.$dylibtype $out/lib/lib$library$newsuffix.$dylibtype
             ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/lib$library$newsuffix.$dylibtype.${abiVersion}
+            # make libtinfo symlinks
+            ln -svf lib''${library}$suffix.$dylibtype $out/lib/libtinfo$newsuffix.$dylibtype
+            ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/libtinfo$newsuffix.$dylibtype.${abiVersion}
           fi
         done
         for statictype in a dll.a la; do
@@ -102,10 +105,6 @@ stdenv.mkDerivation rec {
       done
     done
 
-    # create libtinfo symlink
-    ln -svf $out/lib/libncurses.$dylibtype $out/libtinfo.$dylibtype
-    ln -svf $out/lib/libncurses.$dylibtype.${abiVersion} $out/libtinfo.$dylibtype.${abiVersion}
-        
     # move some utilities to $bin
     # these programs are used at runtime and don't really belong in $dev
     moveToOutput "bin/clear" "$out"