summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2021-08-28 14:47:58 +0200
committerDomen Kožar <domen@dev.si>2021-08-28 14:51:07 +0200
commit0727aba312d5ee83ee98d5786b3e87f206b4e831 (patch)
tree9b4c789b033547ab870218001d7cfc402207d819
parentracket: 8.1 -> 8.2 (diff)
downloadnixpkgs-origin/cachix-aarch64-darwin.tar.gz
cachix: fix build on aarch64-darwinorigin/cachix-aarch64-darwin
-rw-r--r--pkgs/development/haskell-modules/configuration-darwin.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index f23abbd167dc..7572c014db46 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
@@ -252,4 +252,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;
+})