From 75e78ebaecf9cec27503f31669e9bef408eb6944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 28 Aug 2021 14:47:58 +0200 Subject: [PATCH] cachix: fix build on aarch64-darwin --- .../haskell-modules/configuration-darwin.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 9fb5fb33e472..bf7b05148dc7 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -8,7 +8,7 @@ in with haskellLib; -self: super: { +self: super: ({ # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo # see: https://github.com/psibi/shell-conduit/issues/12 @@ -253,4 +253,11 @@ self: super: { # Otherwise impure gcc is used, which is Apple's weird wrapper c2hsc = addTestToolDepends super.c2hsc [ pkgs.gcc ]; -} +} // lib.optionalAttrs pkgs.stdenv.isAarch64 { # aarch64-darwin + + # https://github.com/fpco/unliftio/issues/87 + unliftio = dontCheck super.unliftio; + + # https://github.com/fpco/inline-c/issues/127 + inline-c-cpp = dontCheck super.inline-c-cpp; +})