From 9db61ce7dde5d81341f7e45b4ad3c5a31d14946a Mon Sep 17 00:00:00 2001
From: kyehn <228304369+kyehn@users.noreply.github.com>
Date: Mon, 17 Nov 2025 07:14:04 +0800
Subject: [PATCH] qtscrcpy: 3.3.1 -> 3.3.3

Diff: https://github.com/barry-ran/QtScrcpy/compare/v3.3.1...v3.3.3
---
 pkgs/by-name/qt/qtscrcpy/package.nix          |  8 +++----
 .../qt/qtscrcpy/remove_predefined_paths.patch | 21 ++++++++++++-------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/qt/qtscrcpy/package.nix b/pkgs/by-name/qt/qtscrcpy/package.nix
index c12d29105126..a9757744fb6a 100644
--- a/pkgs/by-name/qt/qtscrcpy/package.nix
+++ b/pkgs/by-name/qt/qtscrcpy/package.nix
@@ -14,14 +14,14 @@
 
 stdenv.mkDerivation rec {
   pname = "qtscrcpy";
-  version = "3.3.1";
+  version = "3.3.3";
 
   src =
     (fetchFromGitHub {
       owner = "barry-ran";
       repo = "QtScrcpy";
       tag = "v${version}";
-      hash = "sha256-kDeMgSIEIQxaTDR/QAcIaEmPjkmUKBsGyF8fISRzu1M=";
+      hash = "sha256-UZgAFptVC67IXYdxTEmB18fJlFdaOrYrQY4JmdGEJXE=";
       fetchSubmodules = true;
     }).overrideAttrs
       (_: {
@@ -46,9 +46,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace QtScrcpy/QtScrcpyCore/{include/QtScrcpyCoreDef.h,src/device/server/server.h} \
-      --replace-fail 'serverVersion = "3.3.1"' 'serverVersion = "${scrcpy.version}"'
-    substituteInPlace QtScrcpy/util/config.cpp \
-      --replace-fail 'COMMON_SERVER_VERSION_DEF "3.3.1"' 'COMMON_SERVER_VERSION_DEF "${scrcpy.version}"'
+      --replace-fail 'serverVersion = "3.3.3"' 'serverVersion = "${scrcpy.version}"'
     substituteInPlace QtScrcpy/audio/audiooutput.cpp \
       --replace-fail 'sndcpy.sh' "$out/share/qtscrcpy/sndcpy.sh"
     substituteInPlace QtScrcpy/sndcpy/sndcpy.sh \
diff --git a/pkgs/by-name/qt/qtscrcpy/remove_predefined_paths.patch b/pkgs/by-name/qt/qtscrcpy/remove_predefined_paths.patch
index 574ced6384a7..7e01b9db7099 100644
--- a/pkgs/by-name/qt/qtscrcpy/remove_predefined_paths.patch
+++ b/pkgs/by-name/qt/qtscrcpy/remove_predefined_paths.patch
@@ -2,7 +2,7 @@ diff --git a/QtScrcpy/main.cpp b/QtScrcpy/main.cpp
 index a24ba60..51e3d76 100644
 --- a/QtScrcpy/main.cpp
 +++ b/QtScrcpy/main.cpp
-@@ -22,22 +22,16 @@ int main(int argc, char *argv[])
+@@ -27,27 +27,16 @@
  {
      // set env
  #ifdef Q_OS_WIN32
@@ -11,17 +11,22 @@ index a24ba60..51e3d76 100644
      qputenv("QTSCRCPY_KEYMAP_PATH", "../../../keymap");
      qputenv("QTSCRCPY_CONFIG_PATH", "../../../config");
  #endif
- 
+
  #ifdef Q_OS_OSX
 -    qputenv("QTSCRCPY_ADB_PATH", "../../../../../../QtScrcpy/QtScrcpyCore/src/third_party/adb/mac/adb");
 -    qputenv("QTSCRCPY_SERVER_PATH", "../../../../../../QtScrcpy/QtScrcpyCore/src/third_party/scrcpy-server");
      qputenv("QTSCRCPY_KEYMAP_PATH", "../../../../../../keymap");
      qputenv("QTSCRCPY_CONFIG_PATH", "../../../../../../config");
  #endif
- 
+
  #ifdef Q_OS_LINUX
--    qputenv("QTSCRCPY_ADB_PATH", "../../../QtScrcpy/QtScrcpyCore/src/third_party/adb/linux/adb");
--    qputenv("QTSCRCPY_SERVER_PATH", "../../../QtScrcpy/QtScrcpyCore/src/third_party/scrcpy-server");
-     qputenv("QTSCRCPY_KEYMAP_PATH", "../../../keymap");
-     qputenv("QTSCRCPY_CONFIG_PATH", "../../../config");
- #endif
+-    // Only set environment variables if they are not already set (e.g., by AppImage AppRun)
+-    if (qgetenv("QTSCRCPY_ADB_PATH").isEmpty()) {
+-        qputenv("QTSCRCPY_ADB_PATH", "../../../QtScrcpy/QtScrcpyCore/src/third_party/adb/linux/adb");
+-    }
+-    if (qgetenv("QTSCRCPY_SERVER_PATH").isEmpty()) {
+-        qputenv("QTSCRCPY_SERVER_PATH", "../../../QtScrcpy/QtScrcpyCore/src/third_party/scrcpy-server");
+-    }
+     if (qgetenv("QTSCRCPY_KEYMAP_PATH").isEmpty()) {
+         qputenv("QTSCRCPY_KEYMAP_PATH", "../../../keymap");
+     }