Skip to content

Commit

Permalink
espanso: fix build on Darwin
Browse files Browse the repository at this point in the history
Use the 11.0 SDK with a 10.13 deployment target.
  • Loading branch information
reckenrode committed Oct 7, 2024
1 parent 7306ea4 commit b0c8d82
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 32 deletions.
33 changes: 4 additions & 29 deletions pkgs/applications/office/espanso/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 [
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b0c8d82

Please sign in to comment.