Unverified Commit aba7de95 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #238451 from yu-re-ka/scrcpy-source

scrcpy: use adb from android-tools
parents 6a0e1e22 3e51c9a0
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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}"
+1 −3
Original line number Diff line number Diff line
@@ -12296,9 +12296,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 { };