Merge pull request #213072 from tjni/cargo-watch

cargo-watch: fix darwin build
This commit is contained in:
Weijia Wang 2023-02-02 04:14:04 +01:00 committed by GitHub
commit 79b6e4c094
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View file

@ -1,19 +1,19 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, Foundation, rust, libiconv }:
{ stdenv, lib, rustPlatform, fetchFromGitHub, Cocoa, CoreServices, Foundation, rust, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "cargo-watch";
version = "8.3.0";
src = fetchFromGitHub {
owner = "passcod";
owner = "watchexec";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2keI5hTWglqh+mLeGzRCxpfnUt6kur0I9fefYwZr5l4=";
hash = "sha256-2keI5hTWglqh+mLeGzRCxpfnUt6kur0I9fefYwZr5l4=";
};
cargoHash = "sha256-kR12j0Z7nXfwh9nPT35/LpkK56a8D1gvVkl9/2s6rIQ=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation libiconv ];
buildInputs = lib.optionals stdenv.isDarwin [ Cocoa CoreServices Foundation libiconv ];
# `test with_cargo` tries to call cargo-watch as a cargo subcommand
# (calling cargo-watch with command `cargo watch`)

View file

@ -15828,7 +15828,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-watch = callPackage ../development/tools/rust/cargo-watch {
inherit (darwin.apple_sdk.frameworks) CoreServices Foundation;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices Foundation;
};
cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { };
cargo-workspaces = callPackage ../development/tools/rust/cargo-workspaces {