diff options
| author | Artturi <Artturin@artturin.com> | 2021-09-29 23:48:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 23:48:39 +0300 |
| commit | c400da5dd0d332ba932597c94545941081d50e37 (patch) | |
| tree | 61cff60a1af5e1181e27becdd296f2b32a487e2b /pkgs/tools/wayland | |
| parent | b2fa55d92677b46be0df8046452eca793e02d684 (diff) | |
| parent | 5ae3ae8e166b3848064a10e08e294eadd12b1c81 (diff) | |
Merge pull request #139777 from Artturin/wshowkeysswitch
Diffstat (limited to 'pkgs/tools/wayland')
| -rw-r--r-- | pkgs/tools/wayland/wshowkeys/default.nix | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/pkgs/tools/wayland/wshowkeys/default.nix b/pkgs/tools/wayland/wshowkeys/default.nix index 00dc1d74910d..32fb81fe1886 100644 --- a/pkgs/tools/wayland/wshowkeys/default.nix +++ b/pkgs/tools/wayland/wshowkeys/default.nix @@ -1,20 +1,17 @@ -{ lib, stdenv, fetchFromSourcehut +{ lib, stdenv, fetchFromGitHub , meson, pkg-config, wayland-scanner, ninja , cairo, libinput, pango, wayland, wayland-protocols, libxkbcommon }: -let - version = "2020-03-29"; - commit = "6388a49e0f431d6d5fcbd152b8ae4fa8e87884ee"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "wshowkeys-unstable"; - inherit version; + version = "2021-08-01"; - src = fetchFromSourcehut { - owner = "~sircmpwn"; + src = fetchFromGitHub { + owner = "ammgws"; repo = "wshowkeys"; - rev = commit; - sha256 = "10kafdja5cwbypspwhvaxjz3hvf51vqjzbgdasl977193cvxgmbs"; + rev = "e8bfc78f08ebdd1316daae59ecc77e62bba68b2b"; + sha256 = "sha256-/HvNCQWsXOJZeCxHWmsLlbBDhBzF7XP/SPLdDiWMDC4="; }; 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 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 ]; # Some portions of the code are taken from Sway which is MIT licensed. # TODO: gpl3Only or gpl3Plus (ask upstream)? platforms = platforms.unix; 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 }; } |