diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-12 06:21:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-12 06:21:36 +0000 |
| commit | e2cf4749869c315f740179790a49ba35f07e3fee (patch) | |
| tree | 55c550f94f8bbbe1b6c5898f5bb3a680bbca4f35 /pkgs/tools/system | |
| parent | d63b57ef349266745ff394b81763bc04d8f2dee3 (diff) | |
| parent | d8fb37f470d79978d7addde761bf8d04877436be (diff) | |
| download | nixlib-e2cf4749869c315f740179790a49ba35f07e3fee.tar nixlib-e2cf4749869c315f740179790a49ba35f07e3fee.tar.gz nixlib-e2cf4749869c315f740179790a49ba35f07e3fee.tar.bz2 nixlib-e2cf4749869c315f740179790a49ba35f07e3fee.tar.lz nixlib-e2cf4749869c315f740179790a49ba35f07e3fee.tar.xz nixlib-e2cf4749869c315f740179790a49ba35f07e3fee.tar.zst nixlib-e2cf4749869c315f740179790a49ba35f07e3fee.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/bottom/default.nix | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 1c0972970419..26dc89d935fc 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -1,14 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, installShellFiles }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, DiskArbitration +, Foundation +, IOKit +, installShellFiles +, libiconv +}: rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-z0WLD6XOlsM5UL9/nUU5Jk1F+UFLm4N42zAlgY3zEbM="; + sha256 = "sha256-/O/VXBpVBgjzYuv1AghzmOBUu0MQXhuF65QswgNwa0k="; }; prePatch = '' @@ -17,9 +26,14 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + DiskArbitration + Foundation + IOKit + libiconv + ]; - cargoSha256 = "sha256-m2UVpsVTEmf6fgE1CFRE6+3097bKnkrMKtY3fAOjS2E="; + cargoSha256 = "sha256-5AZgOzRg7jEyv/4+IiQplrwt2yQO9yNi6BosdSzh5v8="; doCheck = false; |