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

Merge pull request #67873 from ivan/cargo-watch-darwin 

cargo-watch: enable for darwin
This commit is contained in:
Vladyslav M 2019-09-01 13:59:29 +03:00 committed by GitHub
parent d9db65ce4b 78d1b2d29e
commit 76fc3de3ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/rust/cargo-watch/default.nix
View File

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub }: { stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-watch"; pname = "cargo-watch";
@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1c3h9il3y0swvcdrrqgh5r7di522i1cc8zk1kfmx97chy8bhsqvg"; cargoSha256 = "1c3h9il3y0swvcdrrqgh5r7di522i1cc8zk1kfmx97chy8bhsqvg";
buildInputs = lib.optional stdenv.isDarwin CoreServices;
# `test with_cargo` tries to call cargo-watch as a cargo subcommand # `test with_cargo` tries to call cargo-watch as a cargo subcommand
# (calling cargo-watch with command `cargo watch`) # (calling cargo-watch with command `cargo watch`)
checkPhase = "PATH=target/debug:$PATH cargo test"; checkPhase = "PATH=target/debug:$PATH cargo test";
@ -21,7 +23,7 @@ rustPlatform.buildRustPackage rec {
description = "A Cargo subcommand for watching over Cargo project's source"; description = "A Cargo subcommand for watching over Cargo project's source";
homepage = https://github.com/passcod/cargo-watch; homepage = https://github.com/passcod/cargo-watch;
license = licenses.cc0; license = licenses.cc0;
platforms = platforms.linux; platforms = platforms.all;
maintainers = with maintainers; [ xrelkd ]; maintainers = with maintainers; [ xrelkd ivan ];
}; };
} }

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

@ -8361,7 +8361,9 @@ in
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { };
cargo-watch = callPackage ../development/tools/rust/cargo-watch { }; cargo-watch = callPackage ../development/tools/rust/cargo-watch {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { };
cargo-generate = callPackage ../development/tools/rust/cargo-generate { cargo-generate = callPackage ../development/tools/rust/cargo-generate {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;