ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 05:37:27 +03:00
Code Issues Projects Releases Wiki Activity

scrcpy: use adb from android-tools

Browse Source 
android-tools is built from source and available on aarch64-linux, while platform tools isn't
This commit is contained in:
Yureka 2023-06-18 19:11:59 +02:00
parent 8bcef0a5fe
commit 3e51c9a04c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/scrcpy/default.nix
View File

@ -10,7 +10,7 @@
, runtimeShell , runtimeShell
, installShellFiles , installShellFiles
, platform-tools , android-tools
, ffmpeg , ffmpeg
, libusb1 , libusb1
, SDL2 , SDL2
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server" ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server"
# runtime dep on `adb` to push the 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 '' '' + lib.optionalString stdenv.isLinux ''
substituteInPlace $out/share/applications/scrcpy-console.desktop \ substituteInPlace $out/share/applications/scrcpy-console.desktop \
--replace "/bin/bash" "${runtimeShell}" --replace "/bin/bash" "${runtimeShell}"

4
pkgs/top-level/all-packages.nix
View File

@ -12285,9 +12285,7 @@ with pkgs;
inherit (darwin.apple_sdk.libs) utmp; inherit (darwin.apple_sdk.libs) utmp;
}; };
scrcpy = callPackage ../misc/scrcpy { scrcpy = callPackage ../misc/scrcpy { };
inherit (androidenv.androidPkgs_9_0) platform-tools;
};
screen-message = callPackage ../tools/X11/screen-message { }; screen-message = callPackage ../tools/X11/screen-message { };