From 31f557c88feb8e6547805727e193881e35f4c495 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Mon, 17 Feb 2020 23:10:33 +0900
Subject: [PATCH] haskell.compiler.ghc822Binary: propagate llvm dependency
Fixes the following error when attempting to build packages using this
compiler:
<no location info>: error:
Warning: Couldn't figure out LLVM version!
Make sure you have installed LLVM 3.9
<no location info>: error: ghc: could not execute: opt
---
pkgs/development/compilers/ghc/8.2.2-binary.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix
index 1f24b9a1ff2..9f546bcb541 100644
--- a/pkgs/development/compilers/ghc/8.2.2-binary.nix
+++ b/pkgs/development/compilers/ghc/8.2.2-binary.nix
@@ -1,12 +1,15 @@
{ stdenv, substituteAll
, fetchurl, perl, gcc, llvm
, ncurses5, gmp, glibc, libiconv
+, llvmPackages
}:
# Prebuilt only does native
assert stdenv.targetPlatform == stdenv.hostPlatform;
let
+ useLLVM = !stdenv.targetPlatform.isx86;
+
libPath = stdenv.lib.makeLibraryPath ([
ncurses5 gmp
] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
@@ -53,7 +56,7 @@ stdenv.mkDerivation rec {
or (throw "cannot bootstrap GHC on this platform"));
nativeBuildInputs = [ perl ];
- buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm ];
+ propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ];
# Cannot patchelf beforehand due to relative RPATHs that anticipate
# the final install location/