mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 12:23:02 +00:00
haskellPackages.llvm-hs: Use LLVM 6 with llvm-hs, don't run tests on Darwin.
This commit is contained in:
parent
bb76f9a210
commit
a3e7fc876a
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user