forked from mirrors/nixpkgs
adb-sync: fix to make it work with platform-tools
This commit is contained in:
parent
074c7e99e0
commit
5e690b47fd
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchgit, python3, androidsdk, makeWrapper }:
|
||||
{ stdenv, fetchgit, python3, platform-tools, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "adb-sync-${version}";
|
||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1y016bjky5sn58v91jyqfz7vw8qfqnfhb9s9jd32k8y29hy5vy4d";
|
||||
};
|
||||
|
||||
buildInputs = [ python3 androidsdk makeWrapper ];
|
||||
buildInputs = [ python3 platform-tools makeWrapper ];
|
||||
|
||||
phases = "installPhase";
|
||||
|
||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p $out/bin
|
||||
cp $src/adb-channel $src/adb-sync $out/bin/
|
||||
patchShebangs $out/bin
|
||||
wrapProgram $out/bin/adb-sync --suffix PATH : ${androidsdk}/bin
|
||||
wrapProgram $out/bin/adb-sync --suffix PATH : ${platform-tools}/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
@ -825,7 +825,9 @@ in
|
|||
adb = androidenv.androidPkgs_9_0.platform-tools;
|
||||
};
|
||||
|
||||
adb-sync = callPackage ../development/mobile/adb-sync { };
|
||||
adb-sync = callPackage ../development/mobile/adb-sync {
|
||||
inherit (androidenv.androidPkgs_9_0) platform-tools;
|
||||
};
|
||||
|
||||
androidenv = callPackage ../development/mobile/androidenv {
|
||||
pkgs_i686 = pkgsi686Linux;
|
||||
|
|
Loading…
Reference in a new issue