JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haskellPacakges.inline-c-cpp: fix build on darwin

Browse Source
This commit is contained in:
Domen Kožar 2019-07-04 10:16:38 +02:00
parent 2072043efb
commit ddb073ad38
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -159,16 +159,11 @@ self: super: {
then super.double-conversion
else addExtraLibrary super.double-conversion pkgs.libcxx;
inline-c-cpp = if !pkgs.stdenv.isDarwin
then super.inline-c-cpp
else
let drv = addExtraLibrary (overrideCabal super.inline-c-cpp (drv: {
postPatch = ''
substituteInPlace inline-c-cpp.cabal --replace stdc++ c++
'';
})) pkgs.libcxx;
in # https://github.com/fpco/inline-c/issues/75
dontCheck drv;
inline-c-cpp = overrideCabal super.inline-c-cpp (drv: {
postPatch = (drv.postPatch or "") + ''
substituteInPlace inline-c-cpp.cabal --replace "-optc-std=c++11" ""
'';
});
inline-java = addBuildDepend super.inline-java pkgs.jdk;