From 368480a95b0d7c0187cbd6698481c38a0b7286ae Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 23 Feb 2022 10:21:59 +0530 Subject: [PATCH 1/3] scrcpy: 1.22 -> 1.23 --- pkgs/misc/scrcpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index ef1d7b140144..07386e05aee1 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -10,10 +10,10 @@ }: let - version = "1.22"; + version = "1.23"; prebuilt_server = fetchurl { 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 stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bYLvrCw6NNCZqgLWIEObnytgD74cE9pm/Z7dgB8S5x0="; + sha256 = "sha256-WR70wV+EfNFFkMFkffnwaTridd33CpJ0zTAlXYyjZgM="; }; # postPatch: From 7974b85c836d47459786b4b532ab439c02fa5aca Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 23 Feb 2022 11:10:48 +0530 Subject: [PATCH 2/3] scrcpy: make libusb1 an unconditional dependency With the new OTG support for Darwin this is needed on there as well --- pkgs/misc/scrcpy/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 07386e05aee1..3704bfcbefdf 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -38,9 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper meson ninja pkg-config ]; - buildInputs = [ ffmpeg SDL2 ] ++ lib.optionals stdenv.isLinux [ - libusb1 - ]; + buildInputs = [ ffmpeg SDL2 libusb1 ]; # Manually install the server jar to prevent Meson from "fixing" it preConfigure = '' From 3dea07f9a6cdc1cdac518eede1d753ba1235c7c5 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 23 Feb 2022 13:30:24 +0530 Subject: [PATCH 3/3] scrcpy: install shell completions --- pkgs/misc/scrcpy/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 3704bfcbefdf..75caa3fcfb3c 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -2,6 +2,7 @@ , meson , ninja , pkg-config +, installShellFiles , platform-tools , ffmpeg @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { --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 libusb1 ];