Commit 9db61ce7 authored by kyehn's avatar kyehn Committed by kyehn
Browse files

qtscrcpy: 3.3.1 -> 3.3.3 

Diff: https://github.com/barry-ran/QtScrcpy/compare/v3.3.1...v3.3.3
parent aaed8bfd

pkgs/by-name/qt/qtscrcpy/package.nix

+3 −5
Original line number Diff line number Diff line
@@ -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 \

pkgs/by-name/qt/qtscrcpy/remove_predefined_paths.patch

+13 −8
Original line number Diff line number Diff line
@@ -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
@@ -20,8 +20,13 @@ index a24ba60..51e3d76 100644 
 #endif



 #ifdef Q_OS_LINUX

-    // 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");

     qputenv("QTSCRCPY_CONFIG_PATH", "../../../config");

 #endif
 
     }