dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

exa: re-enable documentation build on aarch64-darwin

Browse Source 
ghc builds now on aarch64-darwin

Revert "exa: fix on aarch64-darwin (#133660)"

This reverts commit 6adca8026c.
This commit is contained in:
Pavol Rusnak 2021-09-07 08:19:50 +02:00
parent 00f361a846
commit 23ab07cc24
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/misc/exa/default.nix
View File

@ -18,21 +18,16 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-ah8IjShmivS6IWL3ku/4/j+WNr/LdUnh1YJnPdaFdcM="; cargoSha256 = "sha256-ah8IjShmivS6IWL3ku/4/j+WNr/LdUnh1YJnPdaFdcM=";
nativeBuildInputs = [ nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
cmake pkg-config installShellFiles
# ghc is not supported on aarch64-darwin yet.
] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") pandoc;
buildInputs = [ zlib ] buildInputs = [ zlib ]
++ lib.optionals stdenv.isDarwin [ libiconv Security ]; ++ 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.1.md > man/exa.1
pandoc --standalone -f markdown -t man man/exa_colors.5.md > man/exa_colors.5 pandoc --standalone -f markdown -t man man/exa_colors.5.md > man/exa_colors.5
installManPage man/exa.1 man/exa_colors.5 installManPage man/exa.1 man/exa_colors.5
'' + ''
installShellCompletion \ installShellCompletion \
--name exa completions/completions.bash \ --name exa completions/completions.bash \
--name exa.fish completions/completions.fish \ --name exa.fish completions/completions.fish \