git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67383 from dywedir/scrcpy

scrcpy: 1.8 -> 1.10

commitd09278c200ec025f6be6ac022318a4fa25c6295f authorMarek Mahut <marek.mahut@gmail.com> dateSat 24 Aug 2019, 16:26 (7 years ago) parent3043f6de5d8f76
1 file changed+11−4
pkgs/misc/scrcpy/default.nix+11−4
pkgs/misc/scrcpy/default.nix+11−4
@@ -2,6 +2,7 @@
22, meson
33, ninja
44, pkgconfig
5+, fetchpatch
56
67, platform-tools
78, ffmpeg
@@ -9,10 +10,10 @@
910}:
1011
1112let
12− version = "1.8";
13+ version = "1.10";
1314 prebuilt_server = fetchurl {
1415 url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}.jar";
15− sha256 = "1h755k5xpchlm7wq2yk5mlwjnh7y4yhviffixacby0srj3pmb443";
16+ sha256 = "144k25x6ha89l9p5a1dm6r3fqvgqszzwrhvkvk0r44vg0i71msyb";
1617 };
1718in
1819stdenv.mkDerivation rec {
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
2324 owner = "Genymobile";
2425 repo = pname;
2526 rev = "v${version}";
26− sha256 = "1cx7y3w699s3i8s53l1mb7lkrnbix457hf17liwh00jzb0i7aga7";
27+ sha256 = "0hhncqcs49n9g8sgvwbyvkaq4b1dhrpn7qgnaj6grjcb0i27vzaq";
2728 };
2829
2930 # postPatch:
@@ -39,12 +40,18 @@ stdenv.mkDerivation rec {
3940
4041 buildInputs = [ ffmpeg SDL2 ];
4142
43+ # FIXME: remove on update to > 1.10
44+ patches = [(fetchpatch {
45+ url = "https://github.com/Genymobile/scrcpy/commit/c05056343b56be65ae887f8b7ead61a8072622b9.diff";
46+ sha256 = "1xh24gr2g2i9rk0zyv19jx54hswrq12ssp227vxbhsbamin9ir5b";
47+ })];
48+
4249 # Manually install the server jar to prevent Meson from "fixing" it
4350 preConfigure = ''
4451 echo -n > server/meson.build
4552 '';
4653
47− mesonFlags = ["-Doverride_server_path=${prebuilt_server}"];
54+ mesonFlags = [ "-Doverride_server_path=${prebuilt_server}" ];
4855 postInstall = ''
4956 mkdir -p "$out/share/scrcpy"
5057 ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server.jar"