diff options
author | Aleksana <me@aleksana.moe> | 2024-04-26 16:18:00 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-26 16:18:00 +0800 |
commit | ea6de91e70ce38a89a189d2d1ea644f36ece881a (patch) | |
tree | e0768ee39094e59f21e750075449bd6a6c248dba /pkgs | |
parent | f94583543064e492e4165fcaac42049a66d7444f (diff) | |
parent | 01c6349c14b20bb7b71841bb6b060f37de5c1336 (diff) |
Merge pull request #306387 from khaneliman/sketchybar
sketchybar: pkgs/os-specific -> pkgs/by-name
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/by-name/sk/sketchybar/package.nix (renamed from pkgs/os-specific/darwin/sketchybar/default.nix) | 57 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 34 insertions, 27 deletions
diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/by-name/sk/sketchybar/package.nix index 0cc820986c088..37a9849b2830c 100644 --- a/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -1,27 +1,37 @@ -{ 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 = { - "aarch64-darwin" = "arm64"; - "x86_64-darwin" = "x86"; - }.${system} or (throw "Unsupported system: ${system}"); + 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}"); + + 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; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d57ad6cad353d..2c5051bdf7902 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { |