Skip to content

Commit

Permalink
haskellPackages.llvm-hs: Use LLVM 9
Browse files Browse the repository at this point in the history
  • Loading branch information
jtojnar authored and peti committed Apr 10, 2020
1 parent 450396e commit 5427f5f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkgs/development/haskell-modules/configuration-nix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,11 @@ self: super: builtins.intersectAttrs super {
caramia = dontCheck super.caramia;

llvm-hs =
let llvmHsWithLlvm8 = super.llvm-hs.override { llvm-config = pkgs.llvm_8; };
let llvmHsWithLlvm9 = super.llvm-hs.override { llvm-config = pkgs.llvm_9; };
in
if pkgs.stdenv.isDarwin
then
overrideCabal llvmHsWithLlvm8 (oldAttrs: {
overrideCabal llvmHsWithLlvm9 (oldAttrs: {
# One test fails on darwin.
doCheck = false;
# llvm-hs's Setup.hs file tries to add the lib/ directory from LLVM8 to
Expand All @@ -298,7 +298,7 @@ self: super: builtins.intersectAttrs super {
substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()"
'';
})
else llvmHsWithLlvm8;
else llvmHsWithLlvm9;

# Needs help finding LLVM.
spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;
Expand Down

0 comments on commit 5427f5f

Please sign in to comment.