diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-11-29 17:00:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-29 17:00:45 +0100 |
| commit | 57fa544f8bcbf4ad621a8c783bb2ff84720c2f0d (patch) | |
| tree | ca3de7b15613b7df0268094f8e45457a6b3e5992 /pkgs/applications/video | |
| parent | e8b8afb2552b76e9ac2cf8b9245c9fe31f8ac9d2 (diff) | |
| parent | d865afb0a5c957b1c2dddd0e744b21bda726bf53 (diff) | |
| download | nixpkgs-57fa544f8bcbf4ad621a8c783bb2ff84720c2f0d.tar nixpkgs-57fa544f8bcbf4ad621a8c783bb2ff84720c2f0d.tar.gz nixpkgs-57fa544f8bcbf4ad621a8c783bb2ff84720c2f0d.tar.bz2 nixpkgs-57fa544f8bcbf4ad621a8c783bb2ff84720c2f0d.tar.lz nixpkgs-57fa544f8bcbf4ad621a8c783bb2ff84720c2f0d.tar.xz nixpkgs-57fa544f8bcbf4ad621a8c783bb2ff84720c2f0d.tar.zst nixpkgs-57fa544f8bcbf4ad621a8c783bb2ff84720c2f0d.zip | |
Merge pull request #198775 from zendo/update-screenkey
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/screenkey/default.nix | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index f854054b3b6..83ebf1db9b4 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 |