summary refs log tree commit diff
diff options
context:
space:
mode:
authorJanik <80165193+Janik-Haag@users.noreply.github.com>2023-06-27 15:28:31 +0200
committerGitHub <noreply@github.com>2023-06-27 15:28:31 +0200
commit42e931d6ce1826ad8dece91664f24989a3453173 (patch)
tree4a9817100df32b07ffdba93c0393b3e2ba5a40e2
parent5bd34f14438729ae128a439f781862a44c2f8063 (diff)
parentce6932ffba9f897727355e46d81b1d84de9fa331 (diff)
downloadnixpkgs-42e931d6ce1826ad8dece91664f24989a3453173.tar
nixpkgs-42e931d6ce1826ad8dece91664f24989a3453173.tar.gz
nixpkgs-42e931d6ce1826ad8dece91664f24989a3453173.tar.bz2
nixpkgs-42e931d6ce1826ad8dece91664f24989a3453173.tar.lz
nixpkgs-42e931d6ce1826ad8dece91664f24989a3453173.tar.xz
nixpkgs-42e931d6ce1826ad8dece91664f24989a3453173.tar.zst
nixpkgs-42e931d6ce1826ad8dece91664f24989a3453173.zip
Merge pull request #237987 from SebTM/fix/flameshot_wayland
-rw-r--r--pkgs/tools/misc/flameshot/default.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix
index 137b6cf998d..0d5458bfe22 100644
--- a/pkgs/tools/misc/flameshot/default.nix
+++ b/pkgs/tools/misc/flameshot/default.nix
@@ -6,6 +6,7 @@
 , qttools
 , qtsvg
 , nix-update-script
+, fetchpatch
 }:
 
 mkDerivation rec {
@@ -19,6 +20,15 @@ mkDerivation rec {
     sha256 = "sha256-omyMN8d+g1uYsEw41KmpJCwOmVWLokEfbW19vIvG79w=";
   };
 
+  patches = [
+    # https://github.com/flameshot-org/flameshot/pull/3166
+    (fetchpatch {
+      name = "10-fix-wayland.patch";
+      url = "https://github.com/flameshot-org/flameshot/commit/5fea9144501f7024344d6f29c480b000b2dcd5a6.patch";
+      sha256 = "sha256-SnjVbFMDKD070vR4vGYrwLw6scZAFaQA4b+MbI+0W9E=";
+    })
+  ];
+
   passthru = {
     updateScript = nix-update-script { };
   };