From 85b8dc14ce2b074ec5b0e87c933628ea32fd8fd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Mar 2024 07:24:03 +0000 Subject: [PATCH 1/2] vcpkg-tool: 2024-02-07 -> 2024-03-14 --- pkgs/by-name/vc/vcpkg-tool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix index 801c9d9c7bbd..468a259e2111 100644 --- a/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vcpkg-tool"; - version = "2024-02-07"; + version = "2024-03-14"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg-tool"; rev = finalAttrs.version; - hash = "sha256-JzErV6Eyoz4fI84Zq5+v8eZEttYyYXGf5tK290J25tQ="; + hash = "sha256-xe5a1cK56KvO4DFFz/K1omBCebzTRUOpXDpkOGek10M="; }; nativeBuildInputs = [ From 253bb415853913d5d7a8e54ac0c4013a336fdcd9 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 23 Mar 2024 22:50:56 +0100 Subject: [PATCH 2/2] vcpkg-tool: fix build on x86_64-darwin --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eeec06253147..24019e671dee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -802,6 +802,7 @@ with pkgs; sea-orm-cli = callPackage ../development/tools/sea-orm-cli { }; vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; fmt = fmt_10; };