Unverified Commit 4790d3f9 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #245658 from khaneliman/sketchybar 

sketchybar: 2.15.1 -> 2.15.2
parents efc31517 c1d8ad53

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

+4 −3
Original line number Diff line number Diff line
@@ -7,14 +7,15 @@ 
  AddressBookCore = { inherit ContactsPersistence; };

  AudioToolboxCore = {};

  ContactsPersistence = {};

  UIFoundation = {};

  GameCenterFoundation = {};

  GameCenterUI = {};

  GameCenterUICore = {};

  URLFormatting = {};

  SignpostMetrics = {};

  MediaRemote = {};

  PassKitCore = {};

  SignpostMetrics = {};

  SkyLight = {};

  UIFoundation = {};

  URLFormatting = {};



  # Also expose CoreSymbolication; used by `root` package.

  CoreSymbolication = {};

pkgs/os-specific/darwin/sketchybar/default.nix

+31 −12
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, CoreWLAN, DisplayServices, SkyLight }:

{ lib

, stdenv

, fetchFromGitHub

, Carbon

, Cocoa

, CoreWLAN

, DisplayServices

, MediaRemote

, SkyLight

}:



let

  inherit (stdenv.hostPlatform) system;
@@ -7,34 +16,44 @@ let 
    "x86_64-darwin" = "x86";

  }.${system} or (throw "Unsupported system: ${system}");

in



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "sketchybar";

  version = "2.15.1";

  version = "2.15.2";



  src = fetchFromGitHub {

    owner = "FelixKratz";

    repo = "SketchyBar";

    rev = "v${version}";

    hash = "sha256-0jCVDaFc7ZvA8apeHRoQvPhAlaGlBHzqUkS9or88PcM=";

    rev = "v${finalAttrs.version}";

    hash = "sha256-13wc+1IgplB+L0j1AbBr/MUjEo4W38ZgJwrAhbdOroE=";

  };



  buildInputs = [ Carbon Cocoa CoreWLAN DisplayServices SkyLight ];

  buildInputs = [

    Carbon

    Cocoa

    CoreWLAN

    DisplayServices

    MediaRemote

    SkyLight

  ];



  makeFlags = [

    target

  ];



  installPhase = ''

    runHook preInstall



    mkdir -p $out/bin

    cp ./bin/sketchybar $out/bin/sketchybar



    runHook postInstall

  '';



  meta = with lib; {

  meta = {

    description = "A highly customizable macOS status bar replacement";

    homepage = "https://github.com/FelixKratz/SketchyBar";

    platforms = platforms.darwin;

    maintainers = [ maintainers.azuwis ];

    license = licenses.gpl3;

    license = lib.licenses.gpl3;

    maintainers = with lib.maintainers; [ azuwis khaneliman ];

    platforms = lib.platforms.darwin;

  };

}
 
})

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -12883,7 +12883,7 @@ with pkgs; 
  sixpair = callPackage ../tools/misc/sixpair { };















  sketchybar = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/sketchybar {













    inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa CoreWLAN DisplayServices SkyLight;













    inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa CoreWLAN DisplayServices MediaRemote SkyLight;















  };





























  skippy-xd = callPackage ../tools/X11/skippy-xd { };