summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroxalica <oxalicc@pm.me>2021-11-14 00:56:14 +0800
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-12-17 10:53:36 +0000
commitb99e655194c6ad21a4f5a99108a7a8ddbcab4b11 (patch)
tree8d469030edf8e32b81b8ac847971152e84350304
parent[Backport release-21.11] coqPackages.serapi: init at 8.14.0+0.14.0 for Coq 8.... (diff)
downloadnixpkgs-b99e655194c6ad21a4f5a99108a7a8ddbcab4b11.tar.gz
flameshot: fix under KDE wayland
This is required since KWin relies on absolute paths in `Exec=` to find a process' corresponding desktop file and check if it's allowed to take screenshot. (cherry picked from commit fda144875f0cf47072969c4931523931302b866c)
-rw-r--r--pkgs/tools/misc/flameshot/default.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix
index 6c4f71c507e7..1c0fd19ad2aa 100644
--- a/pkgs/tools/misc/flameshot/default.nix
+++ b/pkgs/tools/misc/flameshot/default.nix
@@ -21,7 +21,9 @@ mkDerivation rec {
};
patches = [
- # Support for USE_LAUNCHER_ABSOLUTE_PATH.
+ # Use absolute install path for `Exec=` in the desktop file.
+ # This is required since KWin relies on absolute paths in `Exec=` to find a process'
+ # corresponding desktop file and check if it's allowed to take screenshot.
# Should be removed when the next release comes out.
(fetchpatch {
url = "https://github.com/flameshot-org/flameshot/commit/1031980ed1e62d24d7f719998b7951d48801e3fa.patch";
@@ -44,9 +46,6 @@ mkDerivation rec {
nativeBuildInputs = [ cmake qttools qtsvg ];
buildInputs = [ qtbase ];
- # Use relative path for the .desktop file.
- cmakeFlags = [ "-DUSE_LAUNCHER_ABSOLUTE_PATH=OFF" ];
-
meta = with lib; {
description = "Powerful yet simple to use screenshot software";
homepage = "https://github.com/flameshot-org/flameshot";