Merge pull request #145918 from msfjarvis/hs/2021-11-14/scrcpy-1.12.0

This commit is contained in:
Maciej Krüger
2021-11-14 14:16:40 +01:00
committed by GitHub

View File

@@ -5,14 +5,15 @@
, platform-tools
, ffmpeg
, libusb1
, SDL2
}:
let
version = "1.19";
version = "1.20";
prebuilt_server = fetchurl {
url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
sha256 = "sha256-h2+TIhguaqxqWNsTNPQiWFXvOhfq68gKq2YB2dHsuGc=";
sha256 = "sha256-sgruSVH5mwYMSkQAC6lN6XP5YEdY72K+slOzcarT3zQ=";
};
in
stdenv.mkDerivation rec {
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "Genymobile";
repo = pname;
rev = "v${version}";
sha256 = "sha256-IR4FTbVtHp9rRm0U4d1zkl0u+oR5FeElJ91NIspSKWg=";
sha256 = "sha256-yj/hpndVC1oInrYmCSKQix1kNWy/GpAlmO/6o3vvQQE=";
};
# postPatch:
@@ -37,7 +38,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper meson ninja pkg-config ];
buildInputs = [ ffmpeg SDL2 ];
buildInputs = [ ffmpeg SDL2 ] ++ lib.optionals stdenv.isLinux [
libusb1
];
# Manually install the server jar to prevent Meson from "fixing" it
preConfigure = ''