[24.05] scrcpy: 2.4 -> 2.7 (#343537)

This commit is contained in:
Peder Bergebakken Sundt 2024-11-14 01:23:23 +01:00 committed by GitHub
commit 75e1043ed4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 10 deletions

View File

@ -17368,6 +17368,12 @@
githubId = 70191398; githubId = 70191398;
name = "Ryan Cao"; name = "Ryan Cao";
}; };
ryand56 = {
email = "git@ryand.ca";
github = "ryand56";
githubId = 22267679;
name = "Ryan Omasta";
};
ryane = { ryane = {
email = "ryanesc@gmail.com"; email = "ryanesc@gmail.com";
github = "ryane"; github = "ryane";

View File

@ -16,12 +16,12 @@
}: }:
let let
version = "2.4"; version = "2.7";
prebuilt_server = fetchurl { prebuilt_server = fetchurl {
name = "scrcpy-server"; name = "scrcpy-server";
inherit version; inherit version;
url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
hash = "sha256-k8Jyt0OGBcBV4Sf3REBk7Xj6nKSfgRVnd/0gHnnOe6M="; hash = "sha256-ojxWWfNsJg8QXAItJ7yz6v/6JgcOe6qe2mbQE3ehrbo=";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
owner = "Genymobile"; owner = "Genymobile";
repo = "scrcpy"; repo = "scrcpy";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-x1feZgCR3ZUi40/YZSjDULYk4W9Pjo17cn8RqcOoeoE="; hash = "sha256-OBMm/GkiIdZaJd9X62vY4M6FVKiHTBwqRtH220bYej4=";
}; };
# display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.
@ -63,17 +63,17 @@ stdenv.mkDerivation rec {
--replace "/bin/bash" "${runtimeShell}" --replace "/bin/bash" "${runtimeShell}"
''; '';
meta = with lib; { meta = {
description = "Display and control Android devices over USB or TCP/IP"; description = "Display and control Android devices over USB or TCP/IP";
homepage = "https://github.com/Genymobile/scrcpy"; homepage = "https://github.com/Genymobile/scrcpy";
changelog = "https://github.com/Genymobile/scrcpy/releases/tag/v${version}"; changelog = "https://github.com/Genymobile/scrcpy/releases/tag/v${version}";
sourceProvenance = with sourceTypes; [ sourceProvenance = with lib.sourceTypes; [
fromSource fromSource
binaryBytecode # server binaryBytecode # server
]; ];
license = licenses.asl20; license = lib.licenses.asl20;
platforms = platforms.unix; platforms = lib.platforms.unix;
maintainers = with maintainers; [ deltaevo ]; maintainers = with lib.maintainers; [ deltaevo ryand56 ];
mainProgram = "scrcpy"; mainProgram = "scrcpy";
}; };
} }

View File

@ -12727,8 +12727,6 @@ with pkgs;
inherit (darwin.apple_sdk.libs) utmp; inherit (darwin.apple_sdk.libs) utmp;
}; };
scrcpy = callPackage ../misc/scrcpy { };
screen-message = callPackage ../tools/X11/screen-message { }; screen-message = callPackage ../tools/X11/screen-message { };
screenkey = callPackage ../applications/video/screenkey { }; screenkey = callPackage ../applications/video/screenkey { };