From 601bef897d1c994dffd5567d36478c0608271bfa Mon Sep 17 00:00:00 2001 From: Gabriella Gonzalez Date: Sun, 2 Jan 2022 13:12:45 -0800 Subject: [PATCH] Enable `aarch64-darwin` in `flake.nix` Currently only GHC 8.10.7 builds on `aarch64-darwin` after this change --- flake.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 3b8365f913..2a4c220f69 100644 --- a/flake.nix +++ b/flake.nix @@ -97,6 +97,12 @@ url = "https://hackage.haskell.org/package/implicit-hie-cradle-0.3.0.5/implicit-hie-cradle-0.3.0.5.tar.gz"; sha256 = "15a7g9x6cjk2b92hb2wilxx4550msxp1pmk5a2shiva821qaxnfq"; }) { }; + + # https://github.com/NixOS/nixpkgs/issues/140774 + ormolu = + if final.system == "aarch64-darwin" + then overrideCabal hsuper.ormolu (_: { enableSeparateBinOutput = false; }) + else hsuper.ormolu; }; hlsSources = @@ -135,7 +141,7 @@ chmod +x $dest ''; }; - } // (flake-utils.lib.eachSystem [ "x86_64-linux" "x86_64-darwin" ]) + } // (flake-utils.lib.eachSystem [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]) (system: let pkgs = import nixpkgs {