From c40708f924d3548b435416c5cee760ef96bc9fb8 Mon Sep 17 00:00:00 2001 From: luxus Date: Sat, 3 Dec 2022 00:52:26 +0100 Subject: [PATCH] darwin.apple_sdk.frameworks.DisplayServices: init Used by sketchybar --- pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix | 1 + .../os-specific/darwin/apple-sdk-11.0/private-frameworks.nix | 5 ++++- pkgs/os-specific/darwin/apple-sdk/default.nix | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix index b7666fe31cdb..d7ac5d9fd904 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix @@ -174,6 +174,7 @@ in rec { ) // ( lib.mapAttrs privateFramework (import ./private-frameworks.nix { inherit frameworks; + libobjc = pkgs.darwin.apple_sdk_11_0.objc4; }) ); diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix index 84ca7c42301b..27749dde100a 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix @@ -1,4 +1,4 @@ -{ frameworks }: with frameworks; +{ frameworks, libobjc }: with frameworks; # generated by hand to avoid exposing all private frameworks # frameworks here are only the necessary ones used by public frameworks. { @@ -22,6 +22,9 @@ # Also expose DebugSymbols; used by `llvmPackages_8.lldb` package. DebugSymbols = {}; + # Also expose DisplayServices; used by `sketchybar` package. + DisplayServices = { inherit libobjc; }; + # Also expose MultitouchSupport; used by `chuck` package. MultitouchSupport = {}; } diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 7cc9e293f725..5cf37e8f4026 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -330,6 +330,7 @@ in rec { "ContactsPersistence" "CoreSymbolication" "DebugSymbols" + "DisplayServices" "GameCenter" "MultitouchSupport" "SkyLight"