diff options
author | Marek Mahut <marek.mahut@gmail.com> | 2019-08-24 16:26:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-24 16:26:59 +0200 |
commit | d09278c200ec025f6be6ac022318a4fa25c6295f (patch) | |
tree | b81b18a5edfcbf2c7b0f0317131e3b8269dccf1d | |
parent | 3043f6d5d941a73d618339909eaadfdcffa1a365 (diff) | |
parent | e5d8f7661638e9b387c83e6451980eda6c172cf4 (diff) | |
download | nixlib-d09278c200ec025f6be6ac022318a4fa25c6295f.tar nixlib-d09278c200ec025f6be6ac022318a4fa25c6295f.tar.gz nixlib-d09278c200ec025f6be6ac022318a4fa25c6295f.tar.bz2 nixlib-d09278c200ec025f6be6ac022318a4fa25c6295f.tar.lz nixlib-d09278c200ec025f6be6ac022318a4fa25c6295f.tar.xz nixlib-d09278c200ec025f6be6ac022318a4fa25c6295f.tar.zst nixlib-d09278c200ec025f6be6ac022318a4fa25c6295f.zip |
Merge pull request #67383 from dywedir/scrcpy
scrcpy: 1.8 -> 1.10
-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" |