nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #209260 from azuwis/sketchybar

Browse Source 
sketchybar: 2.8.2 -> 2.12.3
This commit is contained in:
Nick Cao 2023-01-17 10:42:09 +08:00 committed by GitHub
commit 519ef86421
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix
View File

@ -174,6 +174,7 @@ in rec {
) // (
lib.mapAttrs privateFramework (import ./private-frameworks.nix {
inherit frameworks;
libobjc = pkgs.darwin.apple_sdk_11_0.objc4;
})
);

5
pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix
View File

@ -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 = {};
}

1
pkgs/os-specific/darwin/apple-sdk/default.nix
View File

@ -330,6 +330,7 @@ in rec {
"ContactsPersistence"
"CoreSymbolication"
"DebugSymbols"
"DisplayServices"
"GameCenter"
"MultitouchSupport"
"SkyLight"

9
pkgs/os-specific/darwin/sketchybar/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, memstreamHook, Carbon, Cocoa, SkyLight }:
{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, DisplayServices, SkyLight }:
let
inherit (stdenv.hostPlatform) system;
@ -10,17 +10,16 @@ in
stdenv.mkDerivation rec {
pname = "sketchybar";
version = "2.8.2";
version = "2.13.2";
src = fetchFromGitHub {
owner = "FelixKratz";
repo = "SketchyBar";
rev = "v${version}";
sha256 = "sha256-GmM+0h6xxUzW2kpTDZWAiqJAXoQgdsJRlNbvsuxKmZ8=";
sha256 = "sha256-EPpD1QuJXFFwWcs1gmhjf9zm6mkEM72Zr8NOAAgxI4I=";
};
buildInputs = [ Carbon Cocoa SkyLight ]
++ lib.optionals (stdenv.system == "x86_64-darwin") [ memstreamHook ];
buildInputs = [ Carbon Cocoa DisplayServices SkyLight ];
makeFlags = [
target

4
pkgs/top-level/all-packages.nix
View File

@ -11753,8 +11753,8 @@ with pkgs;
sixpair = callPackage ../tools/misc/sixpair {};
sketchybar = callPackage ../os-specific/darwin/sketchybar {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa SkyLight;
sketchybar = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/sketchybar {
inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa DisplayServices SkyLight;
};
skippy-xd = callPackage ../tools/X11/skippy-xd {};