ncurses: Fix libtinfo for crossplatform

NixOS · Dec 23, 2016 · c826ec6 · aristidb · Dec 28, 2016 · vcunat
1 parent 41652f8
commit c826ec6
Showing 1 changed file with 3 additions and 4 deletions.
diff --git 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"