From 7af650a58892e4c8d4c8c9b5be67a4dd7eebef38 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 1 Nov 2024 11:10:44 -0500 Subject: [PATCH] balena-cli: switch to apple-sdk_12 Upstream is building with macos 12. Looks like 10.15 should be supported, though. --- pkgs/tools/admin/balena-cli/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index 7c93a23fb181..ee9eb2e640ae 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildNpmPackage, - overrideSDK, fetchFromGitHub, testers, balena-cli, @@ -10,16 +9,11 @@ python3, udev, cctools, - darwin, + apple-sdk_12, + darwinMinVersionHook, }: -let - # Fix for: https://github.com/NixOS/nixpkgs/issues/272156 - buildNpmPackage' = buildNpmPackage.override { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - }; -in -buildNpmPackage' rec { +buildNpmPackage rec { pname = "balena-cli"; version = "19.0.13"; @@ -51,8 +45,7 @@ buildNpmPackage' rec { udev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.Cocoa + apple-sdk_12 ]; passthru.tests.version = testers.testVersion {