diff options
-rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/keyd/default.nix | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7ad008549ac8b..9a1c2bba950ed 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1016,6 +1016,12 @@ githubId = 50754358; name = "Alex Winter"; }; + alfarel = { + email = "alfarelcynthesis@proton.me"; + github = "alfarelcynthesis"; + githubId = 104072649; + name = "Cynth"; + }; algram = { email = "aliasgram@gmail.com"; github = "Algram"; diff --git a/pkgs/tools/inputmethods/keyd/default.nix b/pkgs/tools/inputmethods/keyd/default.nix index d74cc15254990..7395c807389a1 100644 --- a/pkgs/tools/inputmethods/keyd/default.nix +++ b/pkgs/tools/inputmethods/keyd/default.nix @@ -8,13 +8,13 @@ }: let - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "rvaiya"; repo = "keyd"; rev = "v" + version; - hash = "sha256-NhZnFIdK0yHgFR+rJm4cW+uEhuQkOpCSLwlXNQy6jas="; + hash = "sha256-pylfQjTnXiSzKPRJh9Jli1hhin/MIGIkZxLKxqlReVo="; }; pypkgs = python3.pkgs; @@ -26,7 +26,7 @@ let postPatch = '' substituteInPlace scripts/${pname} \ - --replace /bin/sh ${runtimeShell} + --replace-fail /bin/sh ${runtimeShell} ''; propagatedBuildInputs = with pypkgs; [ xlib ]; @@ -47,10 +47,10 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace Makefile \ - --replace /usr "" + --replace-fail /usr/local "" - substituteInPlace keyd.service \ - --replace /usr/bin $out/bin + substituteInPlace keyd.service.in \ + --replace-fail @PREFIX@ $out ''; installFlags = [ "DESTDIR=${placeholder "out"}" ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Key remapping daemon for Linux"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ alfarel ]; platforms = platforms.linux; }; } |