Merge pull request #139777 from Artturin/wshowkeysswitch
This commit is contained in:
commit
c400da5dd0
|
@ -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
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue