diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-13 11:53:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-13 17:18:49 +0000 |
| commit | c3e005913d59b8ad64004e60888a71816688af1f (patch) | |
| tree | f65b32f0d16acaa40f2ee82ac736d150de4b6cf5 /nixpkgs/pkgs/tools/misc/exa/default.nix | |
| parent | 1c8034da05499ca3d999f57ba1f6b235e7711ee1 (diff) | |
| parent | db88608d8c811a93b74c99cfa1224952afc78200 (diff) | |
| download | nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.gz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.bz2 nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.lz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.xz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.zst nixlib-c3e005913d59b8ad64004e60888a71816688af1f.zip | |
Merge commit 'db88608d8c811a93b74c99cfa1224952afc78200'
Conflicts: nixpkgs/nixos/modules/config/update-users-groups.pl
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/exa/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/exa/default.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/tools/misc/exa/default.nix b/nixpkgs/pkgs/tools/misc/exa/default.nix index 9cabff9a9bef..632eb4590586 100644 --- a/nixpkgs/pkgs/tools/misc/exa/default.nix +++ b/nixpkgs/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 \ |