From 3e51c9a04c3c2f810ed925691418f77af8ef0c42 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 18 Jun 2023 19:11:59 +0200 Subject: [PATCH] scrcpy: use adb from android-tools android-tools is built from source and available on aarch64-linux, while platform tools isn't --- pkgs/misc/scrcpy/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 277a53e253a2..eadd3d892393 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -10,7 +10,7 @@ , runtimeShell , installShellFiles -, platform-tools +, android-tools , ffmpeg , libusb1 , SDL2 @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server" # runtime dep on `adb` to push the server - wrapProgram "$out/bin/scrcpy" --prefix PATH : "${platform-tools}/bin" + wrapProgram "$out/bin/scrcpy" --prefix PATH : "${android-tools}/bin" '' + lib.optionalString stdenv.isLinux '' substituteInPlace $out/share/applications/scrcpy-console.desktop \ --replace "/bin/bash" "${runtimeShell}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index debd2a6ae5e6..8cb9e8e44839 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12285,9 +12285,7 @@ with pkgs; inherit (darwin.apple_sdk.libs) utmp; }; - scrcpy = callPackage ../misc/scrcpy { - inherit (androidenv.androidPkgs_9_0) platform-tools; - }; + scrcpy = callPackage ../misc/scrcpy { }; screen-message = callPackage ../tools/X11/screen-message { };