diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-27 01:38:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-27 01:38:38 +0200 |
| commit | 0c8001e241f0bb9fb83345b6ab00b32000084e19 (patch) | |
| tree | 03c0fdbfb71919a02eda8af155482ec71c85d4ad /pkgs | |
| parent | 866b27e6ae3c51efb94691b826ac255a4ee25a5f (diff) | |
| parent | 2f35dcbdf544c5b0f697bb1b5abebcd4f4fe9cfd (diff) | |
Merge pull request #306389 from khaneliman/skhd
skhd: pkgs/os-specific -> pkgs/by-name
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/by-name/sk/skhd/org.nixos.skhd.plist (renamed from pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist) | 0 | ||||
| -rw-r--r-- | pkgs/by-name/sk/skhd/package.nix (renamed from pkgs/os-specific/darwin/skhd/default.nix) | 32 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 20 insertions, 16 deletions
diff --git a/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist b/pkgs/by-name/sk/skhd/org.nixos.skhd.plist index e6624487740bc..e6624487740bc 100644 --- a/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist +++ b/pkgs/by-name/sk/skhd/org.nixos.skhd.plist diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/by-name/sk/skhd/package.nix index 539e90562ec71..d3b3b9adb96a9 100644 --- a/pkgs/os-specific/darwin/skhd/default.nix +++ b/pkgs/by-name/sk/skhd/package.nix @@ -1,13 +1,18 @@ -{ lib -, stdenv -, fetchFromGitHub -, Carbon -, Cocoa -, testers -, nix-update-script +{ + lib, + overrideSDK, + stdenv, + darwin, + fetchFromGitHub, + testers, + nix-update-script, }: +let + inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa; -stdenv.mkDerivation (finalAttrs: { + stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; +in +stdenv'.mkDerivation (finalAttrs: { pname = "skhd"; version = "0.3.9"; @@ -23,9 +28,7 @@ stdenv.mkDerivation (finalAttrs: { Cocoa ]; - makeFlags = [ - "BUILD_PATH=$(out)/bin" - ]; + makeFlags = [ "BUILD_PATH=$(out)/bin" ]; env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; @@ -49,7 +52,12 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/koekeishiya/skhd"; license = lib.licenses.mit; mainProgram = "skhd"; - maintainers = with lib.maintainers; [ cmacrae lnl7 periklis khaneliman ]; + maintainers = with lib.maintainers; [ + cmacrae + lnl7 + periklis + khaneliman + ]; platforms = lib.platforms.darwin; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae7ab52a7b591..0545cc91c986e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4052,10 +4052,6 @@ with pkgs; reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { }; - skhd = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/skhd { - inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa; - }; - qes = callPackage ../os-specific/darwin/qes { inherit (darwin.apple_sdk.frameworks) Carbon; }; |