From ddb073ad383afe7f932869430b4ab29829f06d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 4 Jul 2019 10:16:38 +0200 Subject: [PATCH] haskellPacakges.inline-c-cpp: fix build on darwin --- .../haskell-modules/configuration-common.nix | 15 +++++---------- 1 file 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;