Merge pull request #306389 from khaneliman/skhd

skhd: pkgs/os-specific -> pkgs/by-name

authored by Weijia Wang and committed by GitHub 0c8001e2 866b27e6

+20 -16
+20 -12
pkgs/os-specific/darwin/skhd/default.nix pkgs/by-name/sk/skhd/package.nix
··· 1 - { lib 2 - , stdenv 3 - , fetchFromGitHub 4 - , Carbon 5 - , Cocoa 6 - , testers 7 - , nix-update-script 1 + { 2 + lib, 3 + overrideSDK, 4 + stdenv, 5 + darwin, 6 + fetchFromGitHub, 7 + testers, 8 + nix-update-script, 8 9 }: 10 + let 11 + inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa; 9 12 10 - stdenv.mkDerivation (finalAttrs: { 13 + stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; 14 + in 15 + stdenv'.mkDerivation (finalAttrs: { 11 16 pname = "skhd"; 12 17 version = "0.3.9"; 13 18 ··· 23 28 Cocoa 24 29 ]; 25 30 26 - makeFlags = [ 27 - "BUILD_PATH=$(out)/bin" 28 - ]; 31 + makeFlags = [ "BUILD_PATH=$(out)/bin" ]; 29 32 30 33 env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; 31 34 ··· 49 52 homepage = "https://github.com/koekeishiya/skhd"; 50 53 license = lib.licenses.mit; 51 54 mainProgram = "skhd"; 52 - maintainers = with lib.maintainers; [ cmacrae lnl7 periklis khaneliman ]; 55 + maintainers = with lib.maintainers; [ 56 + cmacrae 57 + lnl7 58 + periklis 59 + khaneliman 60 + ]; 53 61 platforms = lib.platforms.darwin; 54 62 }; 55 63 })
pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist pkgs/by-name/sk/skhd/org.nixos.skhd.plist
-4
pkgs/top-level/all-packages.nix
··· 4052 4052 4053 4053 reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { }; 4054 4054 4055 - skhd = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/skhd { 4056 - inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa; 4057 - }; 4058 - 4059 4055 qes = callPackage ../os-specific/darwin/qes { 4060 4056 inherit (darwin.apple_sdk.frameworks) Carbon; 4061 4057 };