diff options
| author | Maciej Krüger <mkg20001@gmail.com> | 2021-11-14 14:16:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-14 14:16:40 +0100 |
| commit | 312a3d0b76a6025e57b6618900a3da7a8e208561 (patch) | |
| tree | f4b7eab81143e01a6763953519be37df651c477f /pkgs/misc | |
| parent | 0b239a479cd2c6246195f76244d0939845f82634 (diff) | |
| parent | 9c83343bb85a4ca71f84213bcd52b1393929e538 (diff) | |
| download | nixpkgs-312a3d0b76a6025e57b6618900a3da7a8e208561.tar nixpkgs-312a3d0b76a6025e57b6618900a3da7a8e208561.tar.gz nixpkgs-312a3d0b76a6025e57b6618900a3da7a8e208561.tar.bz2 nixpkgs-312a3d0b76a6025e57b6618900a3da7a8e208561.tar.lz nixpkgs-312a3d0b76a6025e57b6618900a3da7a8e208561.tar.xz nixpkgs-312a3d0b76a6025e57b6618900a3da7a8e208561.tar.zst nixpkgs-312a3d0b76a6025e57b6618900a3da7a8e208561.zip | |
Merge pull request #145918 from msfjarvis/hs/2021-11-14/scrcpy-1.12.0
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/scrcpy/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 4ffbee14715..f6c576301da 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -5,14 +5,15 @@ , platform-tools , ffmpeg +, libusb1 , SDL2 }: let - version = "1.19"; + version = "1.20"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "sha256-h2+TIhguaqxqWNsTNPQiWFXvOhfq68gKq2YB2dHsuGc="; + sha256 = "sha256-sgruSVH5mwYMSkQAC6lN6XP5YEdY72K+slOzcarT3zQ="; }; in stdenv.mkDerivation rec { @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IR4FTbVtHp9rRm0U4d1zkl0u+oR5FeElJ91NIspSKWg="; + sha256 = "sha256-yj/hpndVC1oInrYmCSKQix1kNWy/GpAlmO/6o3vvQQE="; }; # postPatch: @@ -37,7 +38,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper meson ninja pkg-config ]; - buildInputs = [ ffmpeg SDL2 ]; + buildInputs = [ ffmpeg SDL2 ] ++ lib.optionals stdenv.isLinux [ + libusb1 + ]; # Manually install the server jar to prevent Meson from "fixing" it preConfigure = '' |