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

Merge pull request #161463 from msfjarvis/hs/scrcpy-1.23

Browse Source 
scrcpy: 1.22 -> 1.23
This commit is contained in:
Renaud 2022-02-27 20:56:23 +01:00 committed by GitHub
commit 26e612f59d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/misc/scrcpy/default.nix
View File

@ -2,6 +2,7 @@
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, installShellFiles
, platform-tools , platform-tools
, ffmpeg , ffmpeg
@ -10,10 +11,10 @@
}: }:
let let
version = "1.22"; version = "1.23";
prebuilt_server = fetchurl { prebuilt_server = fetchurl {
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}";
sha256 = "sha256-wF0nPux1M8DhBiguAlTPBOf16PDCkgyjlEiGX6sqQZs="; sha256 = "sha256-KpE/1HR4wLMG/KUHywvrYl5JoZ/5/Hq5BONu9bn+fmg=";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "Genymobile"; owner = "Genymobile";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-bYLvrCw6NNCZqgLWIEObnytgD74cE9pm/Z7dgB8S5x0="; sha256 = "sha256-WR70wV+EfNFFkMFkffnwaTridd33CpJ0zTAlXYyjZgM=";
}; };
# postPatch: # postPatch:
@ -36,11 +37,9 @@ stdenv.mkDerivation rec {
--replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE" --replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE"
''; '';
nativeBuildInputs = [ makeWrapper meson ninja pkg-config ]; nativeBuildInputs = [ makeWrapper meson ninja pkg-config installShellFiles ];
buildInputs = [ ffmpeg SDL2 ] ++ lib.optionals stdenv.isLinux [ buildInputs = [ ffmpeg SDL2 libusb1 ];
libusb1
];
# Manually install the server jar to prevent Meson from "fixing" it # Manually install the server jar to prevent Meson from "fixing" it
preConfigure = '' preConfigure = ''