diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-02-28 00:02:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-28 00:02:07 +0000 |
commit | 678711689037773117624ade4db4f977640cbb36 (patch) | |
tree | 4b900fe0c2d61be387687b901c36e8aa62739603 /pkgs/misc | |
parent | 0a79f47878472cf5e12c1986a9a09829b0f32fee (diff) | |
parent | 0a8007498f9dba0d5feb191d16317ffa85a9e698 (diff) | |
download | nixpkgs-678711689037773117624ade4db4f977640cbb36.tar nixpkgs-678711689037773117624ade4db4f977640cbb36.tar.gz nixpkgs-678711689037773117624ade4db4f977640cbb36.tar.bz2 nixpkgs-678711689037773117624ade4db4f977640cbb36.tar.lz nixpkgs-678711689037773117624ade4db4f977640cbb36.tar.xz nixpkgs-678711689037773117624ade4db4f977640cbb36.tar.zst nixpkgs-678711689037773117624ade4db4f977640cbb36.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/scrcpy/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index ef1d7b14014..75caa3fcfb3 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 @@ -10,10 +11,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 +25,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bYLvrCw6NNCZqgLWIEObnytgD74cE9pm/Z7dgB8S5x0="; + sha256 = "sha256-WR70wV+EfNFFkMFkffnwaTridd33CpJ0zTAlXYyjZgM="; }; # postPatch: @@ -36,11 +37,9 @@ 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 ] ++ lib.optionals stdenv.isLinux [ - libusb1 - ]; + buildInputs = [ ffmpeg SDL2 libusb1 ]; # Manually install the server jar to prevent Meson from "fixing" it preConfigure = '' |