From b0c8d82749bf44603191733e83f7eb3bc246a9e9 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 9 Sep 2024 09:56:23 -0400 Subject: [PATCH] espanso: fix build on Darwin Use the 11.0 SDK with a 10.13 deployment target. --- pkgs/applications/office/espanso/default.nix | 33 +++----------------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index 5679c44ca2dc7dd..4e4e27f749fcf77 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -18,17 +18,8 @@ , wxGTK32 , makeWrapper , stdenv -, AppKit -, Cocoa -, Foundation -, IOKit -, Kernel -, AVFoundation -, Carbon -, QTKit -, AVKit -, WebKit -, System +, apple-sdk_11 +, darwinMinVersionHook , waylandSupport ? false , x11Support ? stdenv.hostPlatform.isLinux , testers @@ -83,17 +74,8 @@ rustPlatform.buildRustPackage rec { libnotify libxkbcommon ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Cocoa - Foundation - IOKit - Kernel - AVFoundation - Carbon - QTKit - AVKit - WebKit - System + apple-sdk_11 + (darwinMinVersionHook "10.13") ] ++ lib.optionals waylandSupport [ wl-clipboard ] ++ lib.optionals x11Support [ @@ -148,13 +130,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ kimat pyrox0 n8henrie ]; platforms = platforms.unix; - # With apple_sdk_10_12, - # kCFURLVolumeAvailableCapacityForImportantUsageKey - # is undefined. - # With apple_sdk_11_0, there is an issue with - # kColorSyncGenericGrayProfile. - broken = stdenv.hostPlatform.system == "x86_64-darwin"; - longDescription = '' Espanso detects when you type a keyword and replaces it while you're typing. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c82e756b1fc454..7db491702b8be4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4867,9 +4867,7 @@ with pkgs; eschalot = callPackage ../tools/security/eschalot { }; - espanso = callPackage ../applications/office/espanso { - inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Foundation IOKit Kernel AVFoundation Carbon QTKit AVKit WebKit System; - }; + espanso = callPackage ../applications/office/espanso { }; espanso-wayland = espanso.override { x11Support = false; waylandSupport = true;