broot: modernize (#362840)

* broot: Darwin cleanups

About withClipboard: the feature both compiles and works perfectly on Darwin now.

* broot: clean up buildInputs

libxcb is no longer a dependency, according to the latest Cargo.lock, xcb-sys been replaced with x11rb

* broot: move to pkgs/by-name
This commit is contained in:
Olivér Falvai
2024-12-07 18:05:23 -05:00
committed by GitHub
parent 1e2c885bb9
commit 386044c208
2 changed files with 3 additions and 13 deletions
@@ -7,13 +7,9 @@
, pkg-config
, libgit2
, oniguruma
, libiconv
, Foundation
, Security
, xorg
, zlib
, buildPackages
, withClipboard ? !stdenv.hostPlatform.isDarwin
, withClipboard ? true
, withTrash ? !stdenv.hostPlatform.isDarwin
}:
@@ -36,10 +32,8 @@ rustPlatform.buildRustPackage rec {
pkg-config
];
buildInputs = [ libgit2 oniguruma xorg.libxcb ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
Foundation
libiconv
Security
# TODO: once https://github.com/Canop/broot/issues/956 is released, oniguruma can be removed.
buildInputs = [ libgit2 oniguruma ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
zlib
];
-4
View File
@@ -2063,10 +2063,6 @@ with pkgs;
brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { };
broot = callPackage ../tools/misc/broot {
inherit (darwin.apple_sdk.frameworks) Foundation Security;
};
ssdfs-utils = callPackage ../tools/filesystems/ssdfs-utils { };
btlejack = python3Packages.callPackage ../applications/radio/btlejack { };