mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 22:43:01 +00:00
espanso: fix build on Darwin (#347008)
This commit is contained in:
commit
f589bbaaa9
@ -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.
|
||||
|
@ -4853,9 +4853,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;
|
||||
|
Loading…
Reference in New Issue
Block a user