From 3bebdf50cb53d5969c32756ebaea1d97b15256d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Ant=C3=B4nio?=
 <18236351+ostmarco@users.noreply.github.com>
Date: Tue, 23 Dec 2025 21:59:04 -0300
Subject: [PATCH 1/2] nix: fix devShell missing Qt6LinguistTools (#4450)

Use inputsFrom to inherit all build dependencies from the
package derivation. This ensures
the development shell includes qt6.qttools.
---
 flake.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0f4994d853..b94f2800f4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,11 @@
   };
 
   outputs =
-    inputs@{ flake-parts, systems, ... }:
+    inputs@{
+      flake-parts,
+      systems,
+      ...
+    }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = import systems;
       imports = [
@@ -114,13 +118,11 @@
           devShells.default = pkgs.mkShell {
             name = "flameshot-dev";
 
-            buildInputs =
-              with pkgs;
-              [
-                cmake
-                gdb
-              ]
-              ++ buildInputs;
+            inputsFrom = [ flameshot ];
+
+            buildInputs = with pkgs; [
+              gdb
+            ];
           };
 
           treefmt = {

From bee989ec55e7034a782fd18bd4e694b74a62ac32 Mon Sep 17 00:00:00 2001
From: borgmanJeremy <46930769+borgmanJeremy@users.noreply.github.com>
Date: Tue, 23 Dec 2025 19:27:01 -0600
Subject: [PATCH 2/2] Update macOS version in workflow configuration (#4456)

---
 .github/workflows/MacOS-pack.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/MacOS-pack.yml b/.github/workflows/MacOS-pack.yml
index 9662703a15..755abefd05 100644
--- a/.github/workflows/MacOS-pack.yml
+++ b/.github/workflows/MacOS-pack.yml
@@ -29,11 +29,11 @@ jobs:
       matrix:
         dist:
           - {
-              os: macos-14,
+              os: macos-15,
               arch: arm64
             }
           - {
-              os: macos-13,
+              os: macos-15,
               arch: intel
             }
     runs-on: ${{ matrix.dist.os }}
@@ -96,4 +96,4 @@ jobs:
         with:
           name: ${{ env.PRODUCT }}-${{ env.VER_INFO }}-artifact-macos-${{ matrix.dist.arch }}
           path: ${{ github.workspace }}/build/src/Flameshot-${{ env.VERSION }}.dmg
-          overwrite: true
\ No newline at end of file
+          overwrite: true