Merge pull request #276406 from mfrischknecht/fix-fast-ssh-build
fast-ssh: fix build issue due to ambiguous trait impls
This commit is contained in:
commit
0cbfa8a0ae
@ -1,6 +1,7 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, Security
|
, Security
|
||||||
}:
|
}:
|
||||||
@ -18,6 +19,15 @@ rustPlatform.buildRustPackage rec {
|
|||||||
|
|
||||||
cargoSha256 = "sha256-sIQNoH3UWX3SwCFCPZEREIFR7C28ml4oGsrq6wuOAT0=";
|
cargoSha256 = "sha256-sIQNoH3UWX3SwCFCPZEREIFR7C28ml4oGsrq6wuOAT0=";
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Can be removed as soon as this is is merged: https://github.com/Julien-R44/fast-ssh/pull/22
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fix-ambiguous-as_ref.patch";
|
||||||
|
url = "https://github.com/Julien-R44/fast-ssh/commit/c082a64a4b412380b2ab145c24161fdaa26175db.patch";
|
||||||
|
hash = "sha256-egkoJF+rQiuClNL8ltzmB7oHngbpOxO29rlwZ3nELOE=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
Loading…
Reference in New Issue
Block a user