From 07af2a322744d7a791f6e7424fc6e81eb6877a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20=C5=BDlender?= Date: Fri, 24 Nov 2023 22:06:42 +0100 Subject: [PATCH] cargo-watch: fix build on darwin (cherry picked from commit c4e7af7473e7ca28dacb9bc89da9587eb469728d) --- pkgs/development/tools/rust/cargo-watch/default.nix | 6 +++--- 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 63217b655ac5..1721e45a1ed0 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 a3773c97492e..2b8a5c8fed07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };