gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtscrcpy: 3.3.1 -> 3.3.3 (#462416)

Browse Source
This commit is contained in:
Aleksana
2025-11-21 10:20:20 +00:00
committed by GitHub
parent a758a0bb05 9db61ce7dd
commit 4afd353cd6
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/qt/qtscrcpy/package.nix
+3 -5
View File
@@ -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
View File
@@ -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");
}