From 27f7cf2caded6afcfa55cc1e3a48f8ce9149186b Mon Sep 17 00:00:00 2001 From: Troels Henriksen Date: Sun, 17 Mar 2019 22:47:20 +0100 Subject: [PATCH] futhark: only wrap the 'futhark' executable Newer versions of Futhark only care about this executable, and the others are thin wrappers that will go away in a future version. --- pkgs/development/haskell-modules/configuration-nix.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 11cede5771a..fac0a419bfd 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -536,10 +536,7 @@ self: super: builtins.intersectAttrs super { let path = stdenv.lib.makeBinPath [ gcc ]; in overrideCabal (addBuildTool super.futhark makeWrapper) (_drv: { postInstall = '' - wrapProgram $out/bin/futhark-c \ - --prefix PATH : "${path}" - - wrapProgram $out/bin/futhark-opencl \ + wrapProgram $out/bin/futhark \ --prefix PATH : "${path}" \ --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \ --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \