diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2021-11-14 16:26:44 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2021-11-14 16:26:44 +0100 |
| commit | 2f78a2d3a32cd6d348404d8d158f9d284597725f (patch) | |
| tree | 825ed9530b7fd9e7287ac2dfea44e5a7edbf8e62 /pkgs/misc | |
| parent | bc35dc4f3b708b17389286795c227bd6716cbcd5 (diff) | |
| parent | f9284c7c3f7d1c6b9707ed8f4317c283a4275cd6 (diff) | |
| download | nixpkgs-2f78a2d3a32cd6d348404d8d158f9d284597725f.tar nixpkgs-2f78a2d3a32cd6d348404d8d158f9d284597725f.tar.gz nixpkgs-2f78a2d3a32cd6d348404d8d158f9d284597725f.tar.bz2 nixpkgs-2f78a2d3a32cd6d348404d8d158f9d284597725f.tar.lz nixpkgs-2f78a2d3a32cd6d348404d8d158f9d284597725f.tar.xz nixpkgs-2f78a2d3a32cd6d348404d8d158f9d284597725f.tar.zst nixpkgs-2f78a2d3a32cd6d348404d8d158f9d284597725f.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
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 = '' |