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

Merge pull request #194704 from viraptor/procs-darwin-intel

Browse Source
This commit is contained in:
Sandro 2022-10-06 11:51:42 +02:00 committed by GitHub
commit 56c4845a4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/admin/procs/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security, libiconv }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security, libiconv, Libsystem }:
rustPlatform.buildRustPackage rec {
pname = "procs";
@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
installShellCompletion procs.{bash,fish} --zsh _procs
'';
buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv Libsystem ];
meta = with lib; {
description = "A modern replacement for ps written in Rust";
@ -32,6 +32,5 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/dalance/procs/raw/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne SuperSandro2000 sciencentistguy ];
broken = stdenv.isDarwin && stdenv.isx86_64;
};
}

5
pkgs/top-level/all-packages.nix
View File

@ -4657,8 +4657,9 @@ with pkgs;
pyznap = python3Packages.callPackage ../tools/backup/pyznap {};
procs = callPackage ../tools/admin/procs {
inherit (darwin.apple_sdk.frameworks) Security;
procs = darwin.apple_sdk_11_0.callPackage ../tools/admin/procs {
inherit (darwin.apple_sdk_11_0.frameworks) Security;
inherit (darwin.apple_sdk_11_0) Libsystem;
inherit (darwin) libiconv;
};