git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67873 from ivan/cargo-watch-darwin

cargo-watch: enable for darwin

commit76fc3de3ef73f0b7852763ef00b80a52be035fcb authorVladyslav M <dywedir@gra.red> dateSun 1 Sep 2019, 13:59 (7 years ago) parentd9db65c78d1b2d
2 files changed+8−4
pkgs/development/tools/rust/cargo-watch/default.nix+5−3 pkgs/top-level/all-packages.nix+3−1
pkgs/development/tools/rust/cargo-watch/default.nix+5−3
@@ -1,4 +1,4 @@
1−{ lib, rustPlatform, fetchFromGitHub }:
1+{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "cargo-watch";
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "1c3h9il3y0swvcdrrqgh5r7di522i1cc8zk1kfmx97chy8bhsqvg";
1515
16+ buildInputs = lib.optional stdenv.isDarwin CoreServices;
17+
1618 # `test with_cargo` tries to call cargo-watch as a cargo subcommand
1719 # (calling cargo-watch with command `cargo watch`)
1820 checkPhase = "PATH=target/debug:$PATH cargo test";
@@ -21,7 +23,7 @@ rustPlatform.buildRustPackage rec {
2123 description = "A Cargo subcommand for watching over Cargo project's source";
2224 homepage = https://github.com/passcod/cargo-watch;
2325 license = licenses.cc0;
24− platforms = platforms.linux;
25− maintainers = with maintainers; [ xrelkd ];
26+ platforms = platforms.all;
27+ maintainers = with maintainers; [ xrelkd ivan ];
2628 };
2729}
pkgs/top-level/all-packages.nix+3−1
@@ -8361,7 +8361,9 @@ in
83618361 inherit (darwin.apple_sdk.frameworks) Security;
83628362 };
83638363 cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { };
8364− cargo-watch = callPackage ../development/tools/rust/cargo-watch { };
8364+ cargo-watch = callPackage ../development/tools/rust/cargo-watch {
8365+ inherit (darwin.apple_sdk.frameworks) CoreServices;
8366+ };
83658367 cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { };
83668368 cargo-generate = callPackage ../development/tools/rust/cargo-generate {
83678369 inherit (darwin.apple_sdk.frameworks) Security;