about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorTroels Henriksen <athas@sigkill.dk>2019-03-17 22:47:20 +0100
committerTroels Henriksen <athas@sigkill.dk>2019-03-17 22:51:20 +0100
commit27f7cf2caded6afcfa55cc1e3a48f8ce9149186b (patch)
tree5a07cad48f58a87a279979a44b3432700908bd0e /pkgs/development/haskell-modules
parent1a2c78b420f7af6fa0bbc4d1bb011ca8bbc6de67 (diff)
downloadnixlib-27f7cf2caded6afcfa55cc1e3a48f8ce9149186b.tar
nixlib-27f7cf2caded6afcfa55cc1e3a48f8ce9149186b.tar.gz
nixlib-27f7cf2caded6afcfa55cc1e3a48f8ce9149186b.tar.bz2
nixlib-27f7cf2caded6afcfa55cc1e3a48f8ce9149186b.tar.lz
nixlib-27f7cf2caded6afcfa55cc1e3a48f8ce9149186b.tar.xz
nixlib-27f7cf2caded6afcfa55cc1e3a48f8ce9149186b.tar.zst
nixlib-27f7cf2caded6afcfa55cc1e3a48f8ce9149186b.zip
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.
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 11cede5771a9..fac0a419bfd1 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" \