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

Merge pull request #64286 from domenkozar/inline-c-cpp-darwin 

haskellPackages.inline-c-cpp: fix build on darwin
This commit is contained in:
Domen Kožar 2019-08-06 22:50:13 +02:00 committed by GitHub
parent ee4b93eab4 ddb073ad38
commit 56b452be4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 then super.double-conversion
else addExtraLibrary super.double-conversion pkgs.libcxx; else addExtraLibrary super.double-conversion pkgs.libcxx;
inline-c-cpp = if !pkgs.stdenv.isDarwin inline-c-cpp = overrideCabal super.inline-c-cpp (drv: {
then super.inline-c-cpp postPatch = (drv.postPatch or "") + ''
else substituteInPlace inline-c-cpp.cabal --replace "-optc-std=c++11" ""
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-java = addBuildDepend super.inline-java pkgs.jdk; inline-java = addBuildDepend super.inline-java pkgs.jdk;