diff options
author | Domen Kožar <domen@dev.si> | 2019-07-04 10:16:38 +0200 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2019-07-04 10:16:38 +0200 |
commit | ddb073ad383afe7f932869430b4ab29829f06d90 (patch) | |
tree | 363407211e9e7d566c3bd8f85d265bb6c2f69a56 /pkgs/development/haskell-modules | |
parent | 2072043efbd74b40ef107e235287ba91e489695b (diff) | |
download | nixlib-ddb073ad383afe7f932869430b4ab29829f06d90.tar nixlib-ddb073ad383afe7f932869430b4ab29829f06d90.tar.gz nixlib-ddb073ad383afe7f932869430b4ab29829f06d90.tar.bz2 nixlib-ddb073ad383afe7f932869430b4ab29829f06d90.tar.lz nixlib-ddb073ad383afe7f932869430b4ab29829f06d90.tar.xz nixlib-ddb073ad383afe7f932869430b4ab29829f06d90.tar.zst nixlib-ddb073ad383afe7f932869430b4ab29829f06d90.zip |
haskellPacakges.inline-c-cpp: fix build on darwin
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 233438b963e8..eeef8a02b7a3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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; |