From ea82517abae1df3444b4dd12fd22d69a8f9b2887 Mon Sep 17 00:00:00 2001 From: ocfox Date: Fri, 29 Jul 2022 14:35:28 +0800 Subject: [PATCH 1/2] maintainers: add ocfox --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0c095db96bcd..1a16e69fcced 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9563,6 +9563,15 @@ fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D"; }]; }; + ocfox = { + email = "i@ocfox.me"; + github = "ocfox"; + githubId = 47410251; + name = "ocfox"; + keys = [{ + fingerprint = "939E F8A5 CED8 7F50 5BB5 B2D0 24BC 2738 5F70 234F"; + }]; + }; odi = { email = "oliver.dunkl@gmail.com"; github = "odi"; From 5bf5bdcd8ae6fc3a9257dd56daa9985e000a1924 Mon Sep 17 00:00:00 2001 From: ocfox Date: Sat, 30 Jul 2022 11:28:38 +0800 Subject: [PATCH 2/2] showmethekey: init at 1.7.3 --- .../video/showmethekey/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/applications/video/showmethekey/default.nix diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/applications/video/showmethekey/default.nix new file mode 100644 index 000000000000..219010eeb393 --- /dev/null +++ b/pkgs/applications/video/showmethekey/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchFromGitHub +, glib +, meson +, ninja +, libevdev +, json-glib +, cairo +, pango +, libinput +, gtk4 +, wrapGAppsHook +, libxkbcommon +, pkg-config +}: +stdenv.mkDerivation rec { + pname = "showmethekey"; + version = "1.7.3"; + + src = fetchFromGitHub { + owner = "AlynxZhou"; + repo = "showmethekey"; + rev = "v${version}"; + sha256 = "sha256-hq4X4dG25YauMjsNXC6Flco9pEpVj3EM2JiFWbRrPaA="; + }; + + nativeBuildInputs = [ + glib + meson + ninja + cairo + pango + json-glib + pkg-config + libevdev + libinput + libxkbcommon + wrapGAppsHook + ]; + + buildInputs = [ + gtk4 + ]; + + meta = with lib; { + homepage = "https://showmethekey.alynx.one/"; + description = "Show keys you typed on screen"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ ocfox ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06e842477314..e76fbe698e8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10595,6 +10595,8 @@ with pkgs; shout = nodePackages.shout; + showmethekey = callPackage ../applications/video/showmethekey { }; + shrikhand = callPackage ../data/fonts/shrikhand { }; shunit2 = callPackage ../tools/misc/shunit2 { };