cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #269720 from szlend/fix-cargo-watch-darwin

Browse source 
cargo-watch: fix build on darwin
This commit is contained in:
Pierre Bourdon 2023-11-25 10:42:58 +01:00 committed by GitHub
commit 55103bf2a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats 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 , rustPlatform
, fetchFromGitHub , fetchFromGitHub
, Cocoa , Cocoa
, CoreServices
, Foundation , Foundation
, libiconv
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -21,7 +19,9 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-0D+aM/zap5UDQ+k9c/p+ZfN1OUjDzFRArvcmqEOcBbM="; 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 # `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`)

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

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