public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ghc: Make various binary GHCs use ncurses5 

Fixes #17008: GHC bootstrapping broken by ncurses update.
This commit is contained in:
Tuomas Tynkkynen 2016-07-16 23:41:28 +03:00
parent b0cc1cd729
commit 8ee0e105c9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/ghc/6.10.2-binary.nix
View File

@ -1,4 +1,4 @@
{stdenv, lib, fetchurl, perl, libedit, ncurses, gmp}: {stdenv, lib, fetchurl, perl, libedit, ncurses5, gmp}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "6.10.2"; version = "6.10.2";
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
(if stdenv.isLinux then '' (if stdenv.isLinux then ''
find . -type f -perm -0100 \ find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libedit}/lib:${ncurses.out}/lib:${gmp.out}/lib" {} \; --set-rpath "${libedit}/lib:${ncurses5.out}/lib:${gmp.out}/lib" {} \;
for prog in ld ar gcc strip ranlib; do for prog in ld ar gcc strip ranlib; do
find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;
done done

4
pkgs/development/compilers/ghc/7.0.4-binary.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, perl, ncurses, gmp, libiconv}: {stdenv, fetchurl, perl, ncurses5, gmp, libiconv}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "7.0.4"; version = "7.0.4";
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
stdenv.lib.optionalString stdenv.isLinux '' stdenv.lib.optionalString stdenv.isLinux ''
find . -type f -perm -0100 \ find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${ncurses.out}/lib:${gmp.out}/lib" {} \; --set-rpath "${ncurses5.out}/lib:${gmp.out}/lib" {} \;
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
for prog in ld ar gcc strip ranlib; do for prog in ld ar gcc strip ranlib; do

4
pkgs/development/compilers/ghc/7.4.2-binary.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, perl, ncurses, gmp, libiconv, makeWrapper}: {stdenv, fetchurl, perl, ncurses5, gmp, libiconv, makeWrapper}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "7.4.2"; version = "7.4.2";
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
# find editline/gmp. # find editline/gmp.
stdenv.lib.optionalString stdenv.isLinux '' stdenv.lib.optionalString stdenv.isLinux ''
mkdir -p "$out/lib" mkdir -p "$out/lib"
ln -sv "${ncurses.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"
find . -type f -perm -0100 \ find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$out/lib:${gmp.out}/lib" {} \; --set-rpath "$out/lib:${gmp.out}/lib" {} \;