diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-07-16 23:41:28 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-07-16 23:47:28 +0300 |
| commit | 8ee0e105c99a1086daa6d1f13ef0dce585a1fe4f (patch) | |
| tree | 3148bbd4a1e71b03b3a3d8d0446e64d982c817d4 /pkgs/development/compilers | |
| parent | b0cc1cd729ad22d6aeac00c0f2bd5209dd833cb4 (diff) | |
| download | nixlib-8ee0e105c99a1086daa6d1f13ef0dce585a1fe4f.tar nixlib-8ee0e105c99a1086daa6d1f13ef0dce585a1fe4f.tar.gz nixlib-8ee0e105c99a1086daa6d1f13ef0dce585a1fe4f.tar.bz2 nixlib-8ee0e105c99a1086daa6d1f13ef0dce585a1fe4f.tar.lz nixlib-8ee0e105c99a1086daa6d1f13ef0dce585a1fe4f.tar.xz nixlib-8ee0e105c99a1086daa6d1f13ef0dce585a1fe4f.tar.zst nixlib-8ee0e105c99a1086daa6d1f13ef0dce585a1fe4f.zip | |
ghc: Make various binary GHCs use ncurses5
Fixes #17008: GHC bootstrapping broken by ncurses update.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ghc/6.10.2-binary.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/7.0.4-binary.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/7.4.2-binary.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 81bdebdcbd47..2df019bd7f16 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, perl, libedit, ncurses, gmp}: +{stdenv, lib, fetchurl, perl, libedit, ncurses5, gmp}: stdenv.mkDerivation rec { version = "6.10.2"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { (if stdenv.isLinux then '' find . -type f -perm -0100 \ -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 find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; done diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index f0f54252b3fc..9b9da4d4f78a 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, ncurses, gmp, libiconv}: +{stdenv, fetchurl, perl, ncurses5, gmp, libiconv}: stdenv.mkDerivation rec { version = "7.0.4"; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { stdenv.lib.optionalString stdenv.isLinux '' find . -type f -perm -0100 \ -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/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 for prog in ld ar gcc strip ranlib; do diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 07137578585d..5faae118d8cb 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, ncurses, gmp, libiconv, makeWrapper}: +{stdenv, fetchurl, perl, ncurses5, gmp, libiconv, makeWrapper}: stdenv.mkDerivation rec { version = "7.4.2"; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { # find editline/gmp. stdenv.lib.optionalString stdenv.isLinux '' 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 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${gmp.out}/lib" {} \; |