diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2021-07-04 18:30:39 +0000 |
|---|---|---|
| committer | Niklas Hambüchen <mail@nh2.me> | 2021-07-05 16:38:24 +0200 |
| commit | 8a2de701f7afb543fb8bd920351715bfabbe7706 (patch) | |
| tree | efad1d161a0081136e37cf27f7a81608400dc348 /pkgs/development/compilers | |
| parent | 67e8744ef8450d6bf6d529ed13dc7172842be425 (diff) | |
| download | nixpkgs-8a2de701f7afb543fb8bd920351715bfabbe7706.tar nixpkgs-8a2de701f7afb543fb8bd920351715bfabbe7706.tar.gz nixpkgs-8a2de701f7afb543fb8bd920351715bfabbe7706.tar.bz2 nixpkgs-8a2de701f7afb543fb8bd920351715bfabbe7706.tar.lz nixpkgs-8a2de701f7afb543fb8bd920351715bfabbe7706.tar.xz nixpkgs-8a2de701f7afb543fb8bd920351715bfabbe7706.tar.zst nixpkgs-8a2de701f7afb543fb8bd920351715bfabbe7706.zip | |
haskell.compiler.ghc8102Binary: Fix build on i686.
The library override that was present in the code referred to a
name that isn't even used in current GHC bindists.
Tested with:
NIX_PATH=nixpkgs=. nix-build --no-link -A haskell.compiler.ghc8102Binary --argstr system i686-linux
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.10.2-binary.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index 69708add3e1..760c2269868 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl, perl, gcc +, ncurses5 , ncurses6, gmp, glibc, libiconv, numactl , llvmPackages @@ -58,7 +59,11 @@ let useLLVM = !stdenv.targetPlatform.isx86; libPath = lib.makeLibraryPath ([ - ncurses6 gmp + # The i686-linux bindist provided by GHC HQ is currently built on Debian 9, + # which link it against `libtinfo.so.5` (ncurses 5). + # Other bindists are linked `libtinfo.so.6` (ncurses 6). + (if stdenv.hostPlatform.system == "i686-linux" then ncurses5 else ncurses6) + gmp ] ++ lib.optional (stdenv.hostPlatform.isDarwin) libiconv ++ lib.optional (stdenv.hostPlatform.isAarch64) numactl); @@ -124,7 +129,6 @@ stdenv.mkDerivation rec { # Rename needed libraries and binaries, fix interpreter lib.optionalString stdenv.isLinux '' find . -type f -perm -0100 -exec patchelf \ - --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.6 libncurses.so \ --interpreter ${glibcDynLinker} {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 |