Unverified Commit ea6de91e authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #306387 from khaneliman/sketchybar 

sketchybar: pkgs/os-specific -> pkgs/by-name
parents f9458354 01c6349c

pkgs/os-specific/darwin/sketchybar/default.nix→pkgs/by-name/sk/sketchybar/package.nix

+34 −23
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, AppKit

, Carbon

, CoreAudio

, CoreWLAN

, CoreVideo

, DisplayServices

, IOKit

, MediaRemote

, SkyLight

, testers

, nix-update-script

{

  lib,

  overrideSDK,

  stdenv,

  darwin,

  fetchFromGitHub,

  testers,

  nix-update-script,

}:



let

  inherit (stdenv.hostPlatform) system;

  target = {

  inherit (darwin.apple_sdk_11_0.frameworks)

    AppKit

    Carbon

    CoreAudio

    CoreWLAN

    CoreVideo

    DisplayServices

    IOKit

    MediaRemote

    SkyLight

    ;



  target =

    {

      "aarch64-darwin" = "arm64";

      "x86_64-darwin" = "x86";

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

    }

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



  stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;

in

stdenv.mkDerivation (finalAttrs: {

stdenv'.mkDerivation (finalAttrs: {

  pname = "sketchybar";

  version = "2.21.0";
@@ -44,9 +54,7 @@ stdenv.mkDerivation (finalAttrs: { 
    SkyLight

  ];



  makeFlags = [

    target

  ];

  makeFlags = [ target ];



  installPhase = ''

    runHook preInstall
@@ -71,7 +79,10 @@ stdenv.mkDerivation (finalAttrs: { 
    homepage = "https://github.com/FelixKratz/SketchyBar";

    license = lib.licenses.gpl3;

    mainProgram = "sketchybar";

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

    maintainers = with lib.maintainers; [

      azuwis

      khaneliman

    ];

    platforms = lib.platforms.darwin;

  };

})

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -13071,10 +13071,6 @@ 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) AppKit Carbon CoreAudio CoreWLAN CoreVideo DisplayServices IOKit MediaRemote SkyLight;













  };



























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





























  sks = callPackage ../servers/sks {