nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-20 23:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #269826 from NixOS/backport-269720-to-release-23.11

Browse Source 
[Backport release-23.11] cargo-watch: fix build on darwin
This commit is contained in:
Nick Cao
2023-11-25 09:41:30 -05:00
committed by GitHub
parent ddbbb20f46 07af2a3227
commit a6f2bdff5b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,9 +3,7 @@
, rustPlatform
, fetchFromGitHub
, Cocoa
, CoreServices
, Foundation
, libiconv
}:
rustPlatform.buildRustPackage rec {
@@ -21,7 +19,9 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-0D+aM/zap5UDQ+k9c/p+ZfN1OUjDzFRArvcmqEOcBbM=";
buildInputs = lib.optionals stdenv.isDarwin [ Cocoa CoreServices Foundation libiconv ];
buildInputs = lib.optionals stdenv.isDarwin [ Foundation Cocoa ];
NIX_LDFLAGS = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-framework" "AppKit" ];
# `test with_cargo` tries to call cargo-watch as a cargo subcommand
# (calling cargo-watch with command `cargo watch`)

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

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