Merge pull request #320606 from Shawn8901/upgrade_keymapp

keymapp: Migrate to pkg/by-name, nixfmt-rfc-style and update 1.1.1 -> 1.2.1
This commit is contained in:
Aleksana 2024-07-03 02:41:32 +08:00 committed by GitHub
commit dcfa91ab15
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 20 deletions

View File

@ -1,44 +1,48 @@
{ stdenv
, lib
, fetchurl
, autoPatchelfHook
, wrapGAppsHook3
, libusb1
, webkitgtk
, gtk3
, writeShellScript
, makeDesktopItem
, copyDesktopItems
{
stdenv,
lib,
fetchurl,
autoPatchelfHook,
wrapGAppsHook4,
libusb1,
libsoup_3,
webkitgtk_4_1,
writeShellScript,
makeDesktopItem,
copyDesktopItems,
}:
let
desktopItem = makeDesktopItem {
name = "keymapp";
icon = "keymapp";
desktopName = "Keymapp";
categories = [ "Settings" "HardwareSettings" ];
categories = [
"Settings"
"HardwareSettings"
];
type = "Application";
exec = "keymapp";
};
in
stdenv.mkDerivation rec {
pname = "keymapp";
version = "1.1.1";
version = "1.2.1";
src = fetchurl {
url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz";
hash = "sha256-tbRlJ65hHPBDwoXAXf++OdcW67RcqR1x1vfhbPCo1Ls=";
hash = "sha256-WiazQD40dG72B9tl4DwcMJgoVEl/Dgq55AHgeqK+sq8=";
};
nativeBuildInputs = [
copyDesktopItems
autoPatchelfHook
wrapGAppsHook3
wrapGAppsHook4
];
buildInputs = [
libusb1
webkitgtk
gtk3
webkitgtk_4_1
libsoup_3
];
sourceRoot = ".";
@ -61,7 +65,10 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.zsa.io/flash/";
description = "Application for ZSA keyboards";
maintainers = with lib.maintainers; [ jankaifer shawn8901 ];
maintainers = with lib.maintainers; [
jankaifer
shawn8901
];
platforms = platforms.linux;
license = lib.licenses.unfree;
};

View File

@ -9460,8 +9460,6 @@ with pkgs;
keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };
keymapp = callPackage ../applications/misc/keymapp { };
keyscope = callPackage ../tools/security/keyscope {
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit Security;
};