wshowkeys: switch to a working fork

This commit is contained in:
Artturin 2021-09-28 18:59:49 +03:00
parent ca88d4db02
commit 5ae3ae8e16

View file

@ -1,20 +1,17 @@
{ lib, stdenv, fetchFromSourcehut { lib, stdenv, fetchFromGitHub
, meson, pkg-config, wayland-scanner, ninja , meson, pkg-config, wayland-scanner, ninja
, cairo, libinput, pango, wayland, wayland-protocols, libxkbcommon , cairo, libinput, pango, wayland, wayland-protocols, libxkbcommon
}: }:
let stdenv.mkDerivation rec {
version = "2020-03-29";
commit = "6388a49e0f431d6d5fcbd152b8ae4fa8e87884ee";
in stdenv.mkDerivation rec {
pname = "wshowkeys-unstable"; pname = "wshowkeys-unstable";
inherit version; version = "2021-08-01";
src = fetchFromSourcehut { src = fetchFromGitHub {
owner = "~sircmpwn"; owner = "ammgws";
repo = "wshowkeys"; repo = "wshowkeys";
rev = commit; rev = "e8bfc78f08ebdd1316daae59ecc77e62bba68b2b";
sha256 = "10kafdja5cwbypspwhvaxjz3hvf51vqjzbgdasl977193cvxgmbs"; sha256 = "sha256-/HvNCQWsXOJZeCxHWmsLlbBDhBzF7XP/SPLdDiWMDC4=";
}; };
nativeBuildInputs = [ meson pkg-config wayland-scanner ninja ]; nativeBuildInputs = [ meson pkg-config wayland-scanner ninja ];
@ -29,13 +26,11 @@ in stdenv.mkDerivation rec {
permissions are dropped after startup. The NixOS module provides such a permissions are dropped after startup. The NixOS module provides such a
setuid binary (use "programs.wshowkeys.enable = true;"). setuid binary (use "programs.wshowkeys.enable = true;").
''; '';
homepage = "https://git.sr.ht/~sircmpwn/wshowkeys"; homepage = "https://github.com/ammgws/wshowkeys";
license = with licenses; [ gpl3Only mit ]; license = with licenses; [ gpl3Only mit ];
# Some portions of the code are taken from Sway which is MIT licensed. # Some portions of the code are taken from Sway which is MIT licensed.
# TODO: gpl3Only or gpl3Plus (ask upstream)? # TODO: gpl3Only or gpl3Plus (ask upstream)?
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ primeos berbiche ]; maintainers = with maintainers; [ primeos berbiche ];
broken = true; # Unmaintained and fails to run (Wayland protocol error)
# TODO (@primeos): Remove this package after the NixOS 21.11 branch-off
}; };
} }