diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-06-19 06:01:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-19 06:01:47 +0000 |
| commit | a452e85f106ee2667a7bc9fa2e21e29ab4de99d2 (patch) | |
| tree | b8d60dd2314c24808ed74f77ed489e319253253b /pkgs/misc | |
| parent | 856c1243c808e5f8b8f2eeea84c64d1e52e02b9b (diff) | |
| parent | 26a382929f8a57fd76ee7dae41b83b20485f7409 (diff) | |
| download | nixlib-a452e85f106ee2667a7bc9fa2e21e29ab4de99d2.tar nixlib-a452e85f106ee2667a7bc9fa2e21e29ab4de99d2.tar.gz nixlib-a452e85f106ee2667a7bc9fa2e21e29ab4de99d2.tar.bz2 nixlib-a452e85f106ee2667a7bc9fa2e21e29ab4de99d2.tar.lz nixlib-a452e85f106ee2667a7bc9fa2e21e29ab4de99d2.tar.xz nixlib-a452e85f106ee2667a7bc9fa2e21e29ab4de99d2.tar.zst nixlib-a452e85f106ee2667a7bc9fa2e21e29ab4de99d2.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/scrcpy/default.nix | 4 |
1 files changed, 2 insertions, 2 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}" |