public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adb-sync: fix to make it work with platform-tools

Browse Source
This commit is contained in:
Sander van der Burg 2018-12-04 21:42:17 +01:00
parent 074c7e99e0
commit 5e690b47fd
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/mobile/adb-sync/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, python3, androidsdk, makeWrapper }: { stdenv, fetchgit, python3, platform-tools, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "adb-sync-${version}"; name = "adb-sync-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1y016bjky5sn58v91jyqfz7vw8qfqnfhb9s9jd32k8y29hy5vy4d"; sha256 = "1y016bjky5sn58v91jyqfz7vw8qfqnfhb9s9jd32k8y29hy5vy4d";
}; };
buildInputs = [ python3 androidsdk makeWrapper ]; buildInputs = [ python3 platform-tools makeWrapper ];
phases = "installPhase"; phases = "installPhase";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin mkdir -p $out/bin
cp $src/adb-channel $src/adb-sync $out/bin/ cp $src/adb-channel $src/adb-sync $out/bin/
patchShebangs $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; { meta = with stdenv.lib; {

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

@ -825,7 +825,9 @@ in
adb = androidenv.androidPkgs_9_0.platform-tools; 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 { androidenv = callPackage ../development/mobile/androidenv {
pkgs_i686 = pkgsi686Linux; pkgs_i686 = pkgsi686Linux;