diff options
author | Pierre Bourdon <delroth@gmail.com> | 2023-11-25 10:42:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-25 10:42:58 +0100 |
commit | 55103bf2a827e34e82ca105864a2cf52ac29b0a4 (patch) | |
tree | f4c5875f60a669380b913afc01960cb439452253 /pkgs | |
parent | 022cec472b81c17c10ef947a3521a795b7db9dbe (diff) | |
parent | c4e7af7473e7ca28dacb9bc89da9587eb469728d (diff) |
Merge pull request #269720 from szlend/fix-cargo-watch-darwin
cargo-watch: fix build on darwin
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/rust/cargo-watch/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 63217b655ac59..1721e45a1ed05 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -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`) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3b70de5f0644..6d08259807abf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17148,8 +17148,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 { }; |