Merge pull request #53523 from jacereda/futhark-darwin

Fix futhark build on Darwin
This commit is contained in:
Bas van Dijk
2019-01-07 12:13:13 +01:00
committed by GitHub
3 changed files with 1 additions and 59 deletions
@@ -532,7 +532,7 @@ self: super: builtins.intersectAttrs super {
# The test-suite requires a running PostgreSQL server.
Frames-beam = dontCheck super.Frames-beam;
futhark = with pkgs;
futhark = if pkgs.stdenv.isDarwin then super.futhark else with pkgs;
let path = stdenv.lib.makeBinPath [ gcc ];
in overrideCabal (addBuildTool super.futhark makeWrapper) (_drv: {
postInstall = ''
@@ -12,7 +12,4 @@ self: super: {
# https://github.com/channable/vaultenv/issues/1
vaultenv = self.callPackage ../tools/haskell/vaultenv { };
# https://github.com/diku-dk/futhark/issues/614
futhark = self.callPackage ../compilers/futhark { };
}