From 96d8375d81ef791eccf5c2c85a705bfc19ccbd96 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 20 Apr 2025 18:40:34 +0100 Subject: [PATCH] sdrangel: adjust for new Darwin SDK pattern --- pkgs/applications/radio/sdrangel/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index ed12a0114b28..f90a0a1c7a04 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -3,6 +3,7 @@ stdenv, airspy, airspyhf, + apple-sdk_12, aptdec, boost, cm256cc, @@ -113,6 +114,7 @@ stdenv.mkDerivation (finalAttrs: { zlib ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ] ++ lib.optionals withSDRplay [ sdrplay ]; cmakeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 707126c1a872..1caee8628b83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12227,9 +12227,7 @@ with pkgs; sddm-sugar-dark = libsForQt5.callPackage ../data/themes/sddm-sugar-dark { }; - sdrangel = qt6Packages.callPackage ../applications/radio/sdrangel { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "12.3" else stdenv; - }; + sdrangel = qt6Packages.callPackage ../applications/radio/sdrangel { }; sgx-sdk = callPackage ../os-specific/linux/sgx/sdk { };