diff options
| author | Domen Kožar <domen@dev.si> | 2020-03-26 15:18:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 15:18:30 +0100 |
| commit | 00373dacd36474dcab416d29a03b6ab45b61f79e (patch) | |
| tree | b97fd4ca01436539d77c42e51f31b024a019f0f5 /pkgs/development/compilers | |
| parent | 3e81254caed63b3783f61c61c384ac2676632c08 (diff) | |
| parent | 31f557c88feb8e6547805727e193881e35f4c495 (diff) | |
| download | nixlib-00373dacd36474dcab416d29a03b6ab45b61f79e.tar nixlib-00373dacd36474dcab416d29a03b6ab45b61f79e.tar.gz nixlib-00373dacd36474dcab416d29a03b6ab45b61f79e.tar.bz2 nixlib-00373dacd36474dcab416d29a03b6ab45b61f79e.tar.lz nixlib-00373dacd36474dcab416d29a03b6ab45b61f79e.tar.xz nixlib-00373dacd36474dcab416d29a03b6ab45b61f79e.tar.zst nixlib-00373dacd36474dcab416d29a03b6ab45b61f79e.zip | |
Merge pull request #80355 from thefloweringash/ghc-aarch64-llvm
haskell.compiler.ghc822Binary: propagate llvm dependency
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.2.2-binary.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix index 1f24b9a1ff24..9f546bcb541c 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/ |