From 4650385d09e43a8250f639243b0ee869af7674ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 14 Jul 2024 20:01:23 -0400 Subject: [PATCH 1/4] flameshot: move to by-name --- .../fl/flameshot/package.nix} | 22 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 14 insertions(+), 10 deletions(-) rename pkgs/{tools/misc/flameshot/default.nix => by-name/fl/flameshot/package.nix} (82%) diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/by-name/fl/flameshot/package.nix similarity index 82% rename from pkgs/tools/misc/flameshot/default.nix rename to pkgs/by-name/fl/flameshot/package.nix index 7b7b58381e9c..b5d47e9fec71 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -1,16 +1,13 @@ -{ mkDerivation +{ libsForQt5 +, stdenv , lib , fetchFromGitHub -, qtbase , cmake -, qttools -, qtsvg , nix-update-script , fetchpatch -, kguiaddons }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "flameshot"; version = "12.1.0"; @@ -38,8 +35,17 @@ mkDerivation rec { (lib.cmakeBool "USE_WAYLAND_CLIPBOARD" true) ]; - nativeBuildInputs = [ cmake qttools qtsvg ]; - buildInputs = [ qtbase kguiaddons ]; + nativeBuildInputs = [ + cmake + libsForQt5.qttools + libsForQt5.qtsvg + libsForQt5.wrapQtAppsHook + ]; + + buildInputs = [ + libsForQt5.qtbase + libsForQt5.kguiaddons + ]; meta = with lib; { description = "Powerful yet simple to use screenshot software"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 343d36b57e36..99457a98072e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30692,8 +30692,6 @@ with pkgs; redoflacs = callPackage ../applications/audio/redoflacs { }; - flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; - flex-ncat = callPackage ../applications/radio/flex-ncat { }; flex-ndax = callPackage ../applications/radio/flex-ndax { }; From 5af98120ad5e871a7b79a663388d7b2714d98306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 14 Jul 2024 20:03:39 -0400 Subject: [PATCH 2/4] flameshot: use unstable version in update script --- pkgs/by-name/fl/flameshot/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix index b5d47e9fec71..c3bd0c64bee4 100644 --- a/pkgs/by-name/fl/flameshot/package.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; - rev = "v${version}"; + rev = "v12.1.0"; sha256 = "sha256-omyMN8d+g1uYsEw41KmpJCwOmVWLokEfbW19vIvG79w="; }; @@ -28,7 +28,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; }; cmakeFlags = [ From 2bad3487c6c3fc69d8aeb308cc22d8d8fc6ddafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 14 Jul 2024 20:07:44 -0400 Subject: [PATCH 3/4] flameshot: 12.1.0 -> 12.1.0-unstable-2024-07-02 --- pkgs/by-name/fl/flameshot/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix index c3bd0c64bee4..233a9e314f02 100644 --- a/pkgs/by-name/fl/flameshot/package.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -7,23 +7,24 @@ , fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "flameshot"; - version = "12.1.0"; + version = "12.1.0-unstable-2024-07-02"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; - rev = "v12.1.0"; - sha256 = "sha256-omyMN8d+g1uYsEw41KmpJCwOmVWLokEfbW19vIvG79w="; + rev = "ccb5a27b136a633911b3b1006185530d9beeea5d"; + hash = "sha256-JIXsdVUR/4183aJ0gvNGYPTyCzX7tCrk8vRtR8bcdhE="; }; patches = [ # https://github.com/flameshot-org/flameshot/pull/3166 + # fixes fractional scaling calculations on wayland (fetchpatch { name = "10-fix-wayland.patch"; url = "https://github.com/flameshot-org/flameshot/commit/5fea9144501f7024344d6f29c480b000b2dcd5a6.patch"; - sha256 = "sha256-SnjVbFMDKD070vR4vGYrwLw6scZAFaQA4b+MbI+0W9E="; + hash = "sha256-SnjVbFMDKD070vR4vGYrwLw6scZAFaQA4b+MbI+0W9E="; }) ]; From 0f4326b2f17d0a470f72ef9f0791dfd5dd93ab4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 14 Jul 2024 20:44:41 -0400 Subject: [PATCH 4/4] flameshot: add flag for wlr support --- pkgs/by-name/fl/flameshot/package.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix index 233a9e314f02..bb7137fb48bc 100644 --- a/pkgs/by-name/fl/flameshot/package.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -5,10 +5,14 @@ , cmake , nix-update-script , fetchpatch +, grim +, makeBinaryWrapper +, enableWlrSupport ? false }: stdenv.mkDerivation { pname = "flameshot"; + # wlr screenshotting is currently only available on unstable version (>12.1.0) version = "12.1.0-unstable-2024-07-02"; src = fetchFromGitHub { @@ -36,6 +40,7 @@ stdenv.mkDerivation { cmakeFlags = [ (lib.cmakeBool "USE_WAYLAND_CLIPBOARD" true) + (lib.cmakeBool "USE_WAYLAND_GRIM" enableWlrSupport) ]; nativeBuildInputs = [ @@ -43,6 +48,7 @@ stdenv.mkDerivation { libsForQt5.qttools libsForQt5.qtsvg libsForQt5.wrapQtAppsHook + makeBinaryWrapper ]; buildInputs = [ @@ -50,6 +56,14 @@ stdenv.mkDerivation { libsForQt5.kguiaddons ]; + dontWrapQtApps = true; + + postFixup = '' + wrapProgram $out/bin/flameshot \ + ${lib.optionalString enableWlrSupport "--prefix PATH : ${lib.makeBinPath [ grim ]}"} \ + ''${qtWrapperArgs[@]} + ''; + meta = with lib; { description = "Powerful yet simple to use screenshot software"; homepage = "https://github.com/flameshot-org/flameshot";