From 2c6889b18afef48970206df9a5287f1c7a35f42b Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 10 Nov 2024 14:53:42 -0800 Subject: [PATCH] vcpkg-tool: use new Darwin SDK pattern --- pkgs/by-name/vc/vcpkg-tool/package.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 - 2 files 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 f21dfc76a69c..04dadbcdc25b 100644 --- a/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , runtimeShell +, apple-sdk_11 , cacert , cmake , cmakerc @@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cmakerc fmt - ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; patches = [ ./change-lock-location.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4341c7de74ee..feaa7cdfbf15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -366,7 +366,6 @@ with pkgs; }; vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; fmt = fmt_10; };