From a3e7fc876ab7412b60ae290f360f2f32854386ff Mon Sep 17 00:00:00 2001 From: Travis Whitaker Date: Sat, 4 Aug 2018 12:41:04 -0700 Subject: [PATCH] haskellPackages.llvm-hs: Use LLVM 6 with llvm-hs, don't run tests on Darwin. --- .../haskell-modules/configuration-nix.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a6cfef6f45f6..3164d23ca53e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -264,11 +264,13 @@ self: super: builtins.intersectAttrs super { } ); - llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm; }; - llvm-hs_6_3_0 = super.llvm-hs_6_3_0.override { - llvm-config = pkgs.llvm_6; - llvm-hs-pure = super.llvm-hs-pure_6_2_1; - }; + llvm-hs = + let dontCheckDarwin = if pkgs.stdenv.isDarwin + then dontCheck + else pkgs.lib.id; + in dontCheckDarwin (super.llvm-hs.override { + llvm-config = pkgs.llvm_6; + }); # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;