From 8aebac5ecad3f1a68b9f1968345ca7eaf2c0122d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Jul 2022 04:20:00 +0000 Subject: [PATCH] watchexec: 1.19.0 -> 1.20.4 --- pkgs/tools/misc/watchexec/default.nix | 12 +++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index d54e906f347e..6fa707b521f3 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices, Foundation, installShellFiles, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, Cocoa, AppKit, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "1.19.0"; + version = "1.20.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "cli-v${version}"; - sha256 = "sha256-Zqu6Qor7kHSeOFyHjcrl6RhB8gL9pljHt7hEd6/0Kss="; + sha256 = "sha256-se3iqz+qjwf71wvHQhCWYryEdUc+kY0Q0ZTg4i1ayNI="; }; - cargoSha256 = "sha256-XwgoYaqgDkNggzi2TL/JPfh8LSFSzSWOVMbkmhXX73I="; + cargoSha256 = "sha256-YM+Zm3wFp3Lsx5LmyjGwZywV/SZjriL6JMDO1l0tNf4="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ Cocoa AppKit ]; + + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; checkFlags = [ "--skip=help" "--skip=help_short" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f08816c0ba8..01e779306d1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11672,7 +11672,7 @@ with pkgs; wander = callPackage ../tools/admin/wander { }; watchexec = callPackage ../tools/misc/watchexec { - inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; + inherit (darwin.apple_sdk.frameworks) Cocoa AppKit; }; watchlog = callPackage ../tools/misc/watchlog { };