Merge pull request #16262 from basvandijk/fix-inline-c-cpp-darwin

inline-c-cpp: fix build on darwin
2016-07-15 16:21:46 +02:00 · 2016-07-15 16:21:46 +02:00 · 9fc0347c93
commit 9fc0347c93
parent f402c6321a d0c7056b92
1 changed files with 9 additions and 0 deletions
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -237,6 +237,15 @@ self: super: {
        '';
      })) pkgs.libcxx;

+  inline-c-cpp = if !pkgs.stdenv.isDarwin
+    then super.inline-c-cpp
+    else addExtraLibrary (overrideCabal super.inline-c-cpp (drv:
+      {
+        postPatch = ''
+          substituteInPlace inline-c-cpp.cabal --replace stdc++ c++
+        '';
+      })) pkgs.libcxx;
+
  # tests don't compile for some odd reason
  jwt = dontCheck super.jwt;