From 906e69d6380996cd97db3789f64ec5577eb1ea9c Mon Sep 17 00:00:00 2001 From: Andreas Baldeau Date: Sat, 15 Sep 2018 23:28:41 +0200 Subject: [PATCH 1/2] android-platform-tools: 26.0.2 -> 28.0.1 --- pkgs/development/mobile/androidenv/platform-tools.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 22b5cd81f870..0dd13f759ff6 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -6,16 +6,16 @@ let in stdenv.mkDerivation rec { - version = "26.0.2"; + version = "28.0.1"; name = "android-platform-tools-r${version}"; src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip"; - sha256 = "0695npvxljbbh8xwfm65k34fcpyfkzvfkssgnp46wkmnq8w5mcb3"; + sha256 = "14kkr9xib5drjjd0bclm0jn3f5xlmlg652mbv4xd83cv7a53a49y"; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-darwin.zip"; - sha256 = "0gy7apw9pmnnm41z6ywglw5va4ghmny4j57778may4q7ar751l56"; + sha256 = "117syrddq1haicwyjzd1p4pfphj0wldjs7w10fpk3n2b7yp37j1v"; } else throw "System ${stdenv.hostPlatform.system} not supported!"; From 1de1bc8038fc6418e285809cbcc387c84bc15da9 Mon Sep 17 00:00:00 2001 From: Andreas Baldeau Date: Sun, 16 Sep 2018 00:12:36 +0200 Subject: [PATCH 2/2] android-platform-tools: patchelf also binaries new in 28.0.1. --- pkgs/development/mobile/androidenv/platform-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 0dd13f759ff6..2cfb11bffbca 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") '' - for i in adb dmtracedump fastboot hprof-conv sqlite3 + for i in adb dmtracedump e2fsdroid fastboot hprof-conv make_f2fs mke2fs sload_f2fs sqlite3 do patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:`pwd`/lib64 $i