ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 14:57:28 +03:00
Code Issues Projects Releases Wiki Activity

futhark: stop wrapping the executable

Browse Source
This commit is contained in:
Troels Henriksen 2020-04-15 18:02:43 +02:00 committed by Peter Simons
parent a0612c2a06
commit 802dfc8bd7
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -572,23 +572,9 @@ self: super: builtins.intersectAttrs super {
# The test-suite requires a running PostgreSQL server. # The test-suite requires a running PostgreSQL server.
Frames-beam = dontCheck super.Frames-beam; Frames-beam = dontCheck super.Frames-beam;
# * Compile manpages (which are in RST and are compiled with Sphinx). # 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).
futhark = with pkgs; futhark = with pkgs;
let maybeWrap = overrideCabal (addBuildTools super.futhark [makeWrapper python37Packages.sphinx])
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])
(_drv: { (_drv: {
postBuild = (_drv.postBuild or "") + '' postBuild = (_drv.postBuild or "") + ''
make -C docs man make -C docs man
@ -597,8 +583,7 @@ self: super: builtins.intersectAttrs super {
postInstall = (_drv.postInstall or "") + '' postInstall = (_drv.postInstall or "") + ''
mkdir -p $out/share/man/man1 mkdir -p $out/share/man/man1
mv docs/_build/man/*.1 $out/share/man/man1/ mv docs/_build/man/*.1 $out/share/man/man1/
'' '';
+ maybeWrap;
}); });
git-annex = with pkgs; git-annex = with pkgs;