From 5ebb1dca9bb056649cbd023f953c0c4e7970bb72 Mon Sep 17 00:00:00 2001 From: oxalica Date: Sat, 23 Oct 2021 22:49:42 +0800 Subject: [PATCH] flameshot: fix desktop Exec path and autostart directory location (cherry picked from commit ccb84b735be81e6e7f4360c9d3eb4b9fe512c8d5) --- pkgs/tools/misc/flameshot/default.nix | 30 +++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 8e17111ce8e..aa1d8c6c18b 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -1,4 +1,12 @@ -{ mkDerivation, lib, fetchFromGitHub, qtbase, cmake, qttools, qtsvg }: +{ mkDerivation +, lib +, fetchFromGitHub +, fetchpatch +, qtbase +, cmake +, qttools +, qtsvg +}: mkDerivation rec { pname = "flameshot"; @@ -11,13 +19,31 @@ mkDerivation rec { sha256 = "1ncknjayl6am740f49g0lc28z1zsifbicxz1j1kwps3ksj15nl7a"; }; + patches = [ + # Support for USE_LAUNCHER_ABSOLUTE_PATH. + # Should be removed when the next release comes out. + (fetchpatch { + url = "https://github.com/flameshot-org/flameshot/commit/1031980ed1e62d24d7f719998b7951d48801e3fa.patch"; + sha256 = "sha256-o8Zz/bBvitXMDFt5rAfubiUPOx+EQ+ITgrfnFM3dFjE="; + }) + # Fix autostart write path. + # Should be removed when the next release comes out. + (fetchpatch { + url = "https://github.com/flameshot-org/flameshot/commit/7977cbb52c2d785abd0d85d9df5991e8f7cae441.patch"; + sha256 = "sha256-wWa9Y+4flBiggOMuX7KQyL+q3f2cALGeQBGusX2x6sk="; + }) + ]; + 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"; - maintainers = with maintainers; [ scode ]; + maintainers = with maintainers; [ scode oxalica ]; license = licenses.gpl3Plus; platforms = platforms.linux; };