From d865afb0a5c957b1c2dddd0e744b21bda726bf53 Mon Sep 17 00:00:00 2001 From: zendo Date: Mon, 31 Oct 2022 18:58:55 +0800 Subject: [PATCH] screenkey: 1.4 -> 1.5 --- pkgs/applications/video/screenkey/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index f854054b3b64..83ebf1db9b4e 100644 --- a/pkgs/applications/video/screenkey/default.nix +++ b/pkgs/applications/video/screenkey/default.nix @@ -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