diff options
| author | Vladyslav M <dywedir@gra.red> | 2019-08-24 13:52:48 +0300 |
|---|---|---|
| committer | Vladyslav M <dywedir@gra.red> | 2019-08-24 16:39:42 +0300 |
| commit | e5d8f7661638e9b387c83e6451980eda6c172cf4 (patch) | |
| tree | 1331784b2e690a9a04cb9f3c5fb9e12e38874653 /pkgs/misc/scrcpy | |
| parent | 19081d4b233a3d754eb3d234c47231100ca767f2 (diff) | |
scrcpy: 1.8 -> 1.10
Diffstat (limited to 'pkgs/misc/scrcpy')
| -rw-r--r-- | pkgs/misc/scrcpy/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 20ba1295c422..bfca574cd497 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -2,6 +2,7 @@ , meson , ninja , pkgconfig +, fetchpatch , platform-tools , ffmpeg @@ -9,10 +10,10 @@ }: let - version = "1.8"; + version = "1.10"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}.jar"; - sha256 = "1h755k5xpchlm7wq2yk5mlwjnh7y4yhviffixacby0srj3pmb443"; + sha256 = "144k25x6ha89l9p5a1dm6r3fqvgqszzwrhvkvk0r44vg0i71msyb"; }; in stdenv.mkDerivation rec { @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "1cx7y3w699s3i8s53l1mb7lkrnbix457hf17liwh00jzb0i7aga7"; + sha256 = "0hhncqcs49n9g8sgvwbyvkaq4b1dhrpn7qgnaj6grjcb0i27vzaq"; }; # postPatch: @@ -39,12 +40,18 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg SDL2 ]; + # FIXME: remove on update to > 1.10 + patches = [(fetchpatch { + url = "https://github.com/Genymobile/scrcpy/commit/c05056343b56be65ae887f8b7ead61a8072622b9.diff"; + sha256 = "1xh24gr2g2i9rk0zyv19jx54hswrq12ssp227vxbhsbamin9ir5b"; + })]; + # Manually install the server jar to prevent Meson from "fixing" it preConfigure = '' echo -n > server/meson.build ''; - mesonFlags = ["-Doverride_server_path=${prebuilt_server}"]; + mesonFlags = [ "-Doverride_server_path=${prebuilt_server}" ]; postInstall = '' mkdir -p "$out/share/scrcpy" ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server.jar" |