diff options
| author | Bobby Rong <rjl931189261@126.com> | 2021-12-17 18:56:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-17 18:56:42 +0800 |
| commit | fa12c60d17c03b2d25e92d4c36c15314d45660c7 (patch) | |
| tree | 8d469030edf8e32b81b8ac847971152e84350304 | |
| parent | [Backport release-21.11] coqPackages.serapi: init at 8.14.0+0.14.0 for Coq 8.... (diff) | |
| parent | flameshot: fix under KDE wayland (diff) | |
| download | nixpkgs-fa12c60d17c03b2d25e92d4c36c15314d45660c7.tar.gz | |
Merge pull request #151074 from NixOS/backport-145777-to-release-21.11
[Backport release-21.11] flameshot: fix under KDE wayland
| -rw-r--r-- | pkgs/tools/misc/flameshot/default.nix | 7 |
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"; |