From 8fe9076af772de5f2bee1926bde937c0962f3c5f Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 13 Nov 2024 22:18:07 -0500 Subject: [PATCH 1/2] ncspot: migrate to new darwin SDK pattern Part of https://github.com/NixOS/nixpkgs/issues/354146 --- pkgs/by-name/nc/ncspot/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix index 85ababb6044b..46d346176116 100644 --- a/pkgs/by-name/nc/ncspot/package.nix +++ b/pkgs/by-name/nc/ncspot/package.nix @@ -3,7 +3,6 @@ stdenv, alsa-lib, config, - darwin, dbus, fetchFromGitHub, libpulseaudio, @@ -51,7 +50,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses ] ++ lib.optional stdenv.hostPlatform.isLinux openssl - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa ++ lib.optional (withALSA || withRodio) alsa-lib ++ lib.optional withClipboard libxcb ++ lib.optional withCover ueberzug From 371aadf3f98124e1c8cd830e30a313290f062acf Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 13 Nov 2024 22:19:47 -0500 Subject: [PATCH 2/2] ncspot: use apple-sdk_11 Fixes a build failure on x86_64-darwin --- pkgs/by-name/nc/ncspot/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix index 46d346176116..9a3383f28775 100644 --- a/pkgs/by-name/nc/ncspot/package.nix +++ b/pkgs/by-name/nc/ncspot/package.nix @@ -2,6 +2,7 @@ lib, stdenv, alsa-lib, + apple-sdk_11, config, dbus, fetchFromGitHub, @@ -49,6 +50,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses ] + ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11 ++ lib.optional stdenv.hostPlatform.isLinux openssl ++ lib.optional (withALSA || withRodio) alsa-lib ++ lib.optional withClipboard libxcb