Merge pull request #96996 from danieldk/broot-1.0.0
broot: 0.20.3 -> 1.0.0, fix Darwin build
This commit is contained in:
commit
638a38bd6c
@ -5,23 +5,33 @@
|
||||
, makeWrapper
|
||||
, coreutils
|
||||
, libiconv
|
||||
, xcbuild
|
||||
, zlib
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "broot";
|
||||
version = "0.20.3";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "0vw956c5xpjsbd9b0ardvgi9jjqb230m2x5n4h9ai0yiwizc8rh6";
|
||||
sha256 = "1dc6lb6ihj4s0mcp1say16j9yr61jdbzhmayxxsm4ansngbzmw45";
|
||||
};
|
||||
|
||||
cargoSha256 = "1zl4p3n327iq7nm7hi79zjxv2gvw9f3lwgkg1qp52kycv1af5gqp";
|
||||
cargoSha256 = "0nqmincayjv1snxz94i14fypc9dv69fxfqqdz3qbcvc2cs62zayg";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
installShellFiles
|
||||
xcbuild # The cc crate attempts to run xcbuild.
|
||||
];
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
Security
|
||||
zlib
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/verb/builtin.rs --replace '"/bin/' '"${coreutils}/bin/'
|
||||
|
Loading…
Reference in New Issue
Block a user