Merge pull request #246285 from khaneliman/skhd

skhd: 0.3.5 -> 0.3.9
This commit is contained in:
Pol Dellaiera 2023-07-31 23:30:47 +02:00 committed by GitHub
commit de72df3675
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 15 deletions

View File

@ -1,19 +1,29 @@
{ lib, stdenv, fetchFromGitHub, Carbon }:
{ lib
, stdenv
, fetchFromGitHub
, Carbon
, Cocoa
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "skhd";
version = "0.3.5";
version = "0.3.9";
src = fetchFromGitHub {
owner = "koekeishiya";
repo = pname;
rev = "v${version}";
sha256 = "0x099979kgpim18r0vi9vd821qnv0rl3rkj0nd1nx3wljxgf7mrg";
repo = "skhd";
rev = "v${finalAttrs.version}";
hash = "sha256-fnkWws/g4BdHKDRhqoCpdPFUavOHdk8R7h7H1dAdAYI=";
};
buildInputs = [ Carbon ];
buildInputs = [
Carbon
Cocoa
];
makeFlags = [ "BUILD_PATH=$(out)/bin" ];
makeFlags = [
"BUILD_PATH=$(out)/bin"
];
postInstall = ''
mkdir -p $out/Library/LaunchDaemons
@ -21,11 +31,11 @@ stdenv.mkDerivation rec {
substituteInPlace $out/Library/LaunchDaemons/org.nixos.skhd.plist --subst-var out
'';
meta = with lib; {
meta = {
description = "Simple hotkey daemon for macOS";
homepage = "https://github.com/koekeishiya/skhd";
platforms = platforms.darwin;
maintainers = with maintainers; [ cmacrae lnl7 periklis ];
license = licenses.mit;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ cmacrae lnl7 periklis khaneliman];
platforms = lib.platforms.darwin;
};
}
})

View File

@ -3944,8 +3944,8 @@ with pkgs;
reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { };
skhd = callPackage ../os-specific/darwin/skhd {
inherit (darwin.apple_sdk.frameworks) Carbon;
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 {