skhd: pkgs/os-specific -> pkgs/by-name
This commit is contained in:
parent
3d06f73179
commit
2f35dcbdf5
|
@ -1,13 +1,18 @@
|
||||||
{ lib
|
{
|
||||||
, stdenv
|
lib,
|
||||||
, fetchFromGitHub
|
overrideSDK,
|
||||||
, Carbon
|
stdenv,
|
||||||
, Cocoa
|
darwin,
|
||||||
, testers
|
fetchFromGitHub,
|
||||||
, nix-update-script
|
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";
|
pname = "skhd";
|
||||||
version = "0.3.9";
|
version = "0.3.9";
|
||||||
|
|
||||||
|
@ -23,9 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
Cocoa
|
Cocoa
|
||||||
];
|
];
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [ "BUILD_PATH=$(out)/bin" ];
|
||||||
"BUILD_PATH=$(out)/bin"
|
|
||||||
];
|
|
||||||
|
|
||||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
|
env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
|
||||||
|
|
||||||
|
@ -49,7 +52,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
homepage = "https://github.com/koekeishiya/skhd";
|
homepage = "https://github.com/koekeishiya/skhd";
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
mainProgram = "skhd";
|
mainProgram = "skhd";
|
||||||
maintainers = with lib.maintainers; [ cmacrae lnl7 periklis khaneliman ];
|
maintainers = with lib.maintainers; [
|
||||||
|
cmacrae
|
||||||
|
lnl7
|
||||||
|
periklis
|
||||||
|
khaneliman
|
||||||
|
];
|
||||||
platforms = lib.platforms.darwin;
|
platforms = lib.platforms.darwin;
|
||||||
};
|
};
|
||||||
})
|
})
|
|
@ -4080,10 +4080,6 @@ with pkgs;
|
||||||
|
|
||||||
reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { };
|
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 {
|
qes = callPackage ../os-specific/darwin/qes {
|
||||||
inherit (darwin.apple_sdk.frameworks) Carbon;
|
inherit (darwin.apple_sdk.frameworks) Carbon;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user