From c826ec60909a00b6093b708aa907f7f1dd018558 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Fri, 23 Dec 2016 13:18:58 +1000 Subject: [PATCH] ncurses: Fix libtinfo for crossplatform --- pkgs/development/libraries/ncurses/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 302c8681677..c7048cfa8fe 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"