Unverified Commit a188d1e8 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

bottom: add gpu recognition, new apple sdk, refactor (#360568)

parents f3ab2eff cf269ecc

pkgs/tools/system/bottom/default.nix→pkgs/by-name/bo/bottom/package.nix

+29 −16
Original line number Diff line number Diff line
@@ -2,11 +2,12 @@ 
  lib,

  rustPlatform,

  fetchFromGitHub,

  autoAddDriverRunpath,

  installShellFiles,

  stdenv,

  darwin,

  bottom,

  testers,

  apple-sdk_11,

  versionCheckHook,

  nix-update-script,

}:



rustPlatform.buildRustPackage rec {
@@ -15,21 +16,22 @@ rustPlatform.buildRustPackage rec { 


  src = fetchFromGitHub {

    owner = "ClementTsang";

    repo = pname;

    rev = version;

    repo = "bottom";

    tag = version;

    hash = "sha256-hm0Xfd/iW+431HflvZErjzeZtSdXVb/ReoNIeETJ5Ik=";

  };



  cargoHash = "sha256-FQbJx6ijX8kE4qxT7OQ7FwxLKJB5/moTKhBK0bfvBas=";



  nativeBuildInputs = [ installShellFiles ];

  nativeBuildInputs = [

    autoAddDriverRunpath

    installShellFiles

  ];



  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

    darwin.apple_sdk_11_0.frameworks.Foundation

    apple-sdk_11

  ];



  doCheck = false;



  postInstall = ''

    installManPage target/tmp/bottom/manpage/btm.1

    installShellCompletion \
@@ -39,21 +41,32 @@ rustPlatform.buildRustPackage rec { 
    install -Dm444 desktop/bottom.desktop -t $out/share/applications

  '';



  preCheck = ''

    HOME=$(mktemp -d)

  '';



  doInstallCheck = true;

  nativeInstallCheckInputs = [

    versionCheckHook

  ];

  versionCheckProgram = "${placeholder "out"}/bin/btm";



  BTM_GENERATE = true;



  passthru.tests.version = testers.testVersion {

    package = bottom;

  passthru = {

    updateScript = nix-update-script { };

  };



  meta = with lib; {

  meta = {

    changelog = "https://github.com/ClementTsang/bottom/blob/${version}/CHANGELOG.md";

    description = "Cross-platform graphical process/system monitor with a customizable interface";

    homepage = "https://github.com/ClementTsang/bottom";

    changelog = "https://github.com/ClementTsang/bottom/blob/${version}/CHANGELOG.md";

    license = licenses.mit;

    maintainers = with maintainers; [

    license = lib.licenses.mit;

    mainProgram = "btm";

    maintainers = with lib.maintainers; [

      berbiche

      figsoda

      gepbird

    ];

    mainProgram = "btm";

  };

}

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -18787,8 +18787,6 @@ with pkgs; 
    inherit (darwin.apple_sdk.frameworks) CoreServices;

  };













  bottom = darwin.apple_sdk_11_0.callPackage ../tools/system/bottom { };



























  cagebreak = callPackage ../applications/window-managers/cagebreak {















    wlroots = wlroots_0_17;















  };