futhark: stop wrapping the executable

1 files changed, 3 insertions, 18 deletions

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 9c85c2b0f733..a8aec8e018ec 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -572,23 +572,9 @@ self: super: builtins.intersectAttrs super {
   # The test-suite requires a running PostgreSQL server.
   Frames-beam = dontCheck super.Frames-beam;
 
-  # * Compile manpages (which are in RST and are compiled with Sphinx).
-  #
-  # * Wrap so that binary can find GCC and OpenCL headers (dubious if
-  #   a good idea).
+  # Compile manpages (which are in RST and are compiled with Sphinx).
   futhark = with pkgs;
-    let maybeWrap =
-          if pkgs.stdenv.isDarwin then ""
-          else
-            let path = stdenv.lib.makeBinPath [ gcc ];
-            in ''
-            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" \
-              --set NIX_CFLAGS_LINK "-L${ocl-icd}/lib"
-            '';
-    in overrideCabal (addBuildTools super.futhark [makeWrapper python37Packages.sphinx])
+    overrideCabal (addBuildTools super.futhark [makeWrapper python37Packages.sphinx])
       (_drv: {
         postBuild = (_drv.postBuild or "") + ''
         make -C docs man
@@ -597,8 +583,7 @@ self: super: builtins.intersectAttrs super {
         postInstall = (_drv.postInstall or "") + ''
         mkdir -p $out/share/man/man1
         mv docs/_build/man/*.1 $out/share/man/man1/
-        ''
-        + maybeWrap;
+        '';
       });
 
   git-annex = with pkgs;