Merge pull request #198775 from zendo/update-screenkey

This commit is contained in:
Sandro 2022-11-29 17:00:45 +01:00 committed by GitHub
commit 57fa544f8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,23 +1,23 @@
{ lib
, fetchFromGitLab
# native
, wrapGAppsHook
# not native
, xorg
, gobject-introspection
, gtk3
, libappindicator-gtk3
, slop
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "screenkey";
version = "1.4";
version = "1.5";
src = fetchFromGitLab {
owner = "screenkey";
repo = "screenkey";
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1rfngmkh01g5192pi04r1fm7vsz6hg9k3qd313sn9rl9xkjgp11l";
hash = "sha256-kWktKzRyWHGd1lmdKhPwrJoSzAIN2E5TKyg30uhM4Ug=";
};
nativeBuildInputs = [
@ -28,20 +28,24 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = [
gtk3
libappindicator-gtk3
];
propagatedBuildInputs = with python3.pkgs; [
babel
pycairo
pygobject3
dbus-python
];
# Prevent double wrapping because of wrapGAppsHook
dontWrapGApps = true;
# https://github.com/NixOS/nixpkgs/issues/56943
strictDeps = false;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
makeWrapperArgs+=(
--prefix PATH ":" "${lib.makeBinPath [ slop ]}"
"''${gappsWrapperArgs[@]}"
)
'';
# screenkey does not have any tests