From 23ab07cc245a3c26d8fe7a92d293c53315abe4eb Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 7 Sep 2021 08:19:50 +0200 Subject: [PATCH] exa: re-enable documentation build on aarch64-darwin ghc builds now on aarch64-darwin Revert "exa: fix on aarch64-darwin (#133660)" This reverts commit 6adca8026c26d49de0c07a239642c33df58376a8. --- pkgs/tools/misc/exa/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 9cabff9a9bef..632eb4590586 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -18,21 +18,16 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ah8IjShmivS6IWL3ku/4/j+WNr/LdUnh1YJnPdaFdcM="; - nativeBuildInputs = [ - cmake pkg-config installShellFiles - # ghc is not supported on aarch64-darwin yet. - ] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") pandoc; - + nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; - outputs = [ "out" ] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") "man"; + outputs = [ "out" "man" ]; - postInstall = lib.optionalString (stdenv.hostPlatform.system != "aarch64-darwin") '' + postInstall = '' pandoc --standalone -f markdown -t man man/exa.1.md > man/exa.1 pandoc --standalone -f markdown -t man man/exa_colors.5.md > man/exa_colors.5 installManPage man/exa.1 man/exa_colors.5 - '' + '' installShellCompletion \ --name exa completions/completions.bash \ --name exa.fish completions/completions.fish \