alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

gnirehtet: 2.2.1 -> 2.3

Browse source
This commit is contained in:
Vladyslav Mykhailichenko 2018-09-16 14:08:42 +03:00
parent 69b6230cee
commit 9501915218
2 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/tools/networking/gnirehtet/default.nix
View file

@ -1,11 +1,11 @@
{stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, substituteAll}: {stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, substituteAll}:
let let
version = "2.2.1"; version = "2.3";
apk = stdenv.mkDerivation { apk = stdenv.mkDerivation {
name = "gnirehtet.apk-${version}"; name = "gnirehtet.apk-${version}";
src = fetchzip { src = fetchzip {
url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip"; url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip";
sha256 = "1rz2wdjc1y7n8fhskmki1nj0ak80ylxspcsrcdnjkk9r7jbq0kan"; sha256 = "08pgmpbz82cd8ndr2syiv25l5xk1gvh9gzji4pgva5gw269bjmpz";
}; };
installPhase = '' installPhase = ''
mkdir $out mkdir $out
@ -20,10 +20,10 @@ rustPlatform.buildRustPackage rec {
owner = "Genymobile"; owner = "Genymobile";
repo = "gnirehtet"; repo = "gnirehtet";
rev = "v${version}"; rev = "v${version}";
sha256 = "1mv8nq4422k2d766qjqqnqp47qzzbbvlwhdni0k6w4nmd3m5cnd9"; sha256 = "118ig42qzr2xyra7r8zfxq38xidaxfc98ja9836jwnn9fgbigczr";
}; };
sourceRoot = "source/relay-rust"; sourceRoot = "source/relay-rust";
cargoSha256 = "11qf9n6h6akvb0rbmsgdlfmypkbnas8ss1cs7i8w19mh7524n0v5"; cargoSha256 = "0370jbllahcdhs132szbxb2yr675s5smm74sx58qi8jhykbb5qs7";
patchFlags = [ "-p2" ]; patchFlags = [ "-p2" ];
patches = [ patches = [

25
pkgs/tools/networking/gnirehtet/paths.patch
View file

@ -1,7 +1,7 @@
diff --git a/relay-rust/src/main.rs b/relay-rust/src/main.rs Index: gnirehtet/relay-rust/src/main.rs
index 4f1be53..96d2e78 100644 ===================================================================
--- a/relay-rust/src/main.rs --- gnirehtet.orig/relay-rust/src/main.rs
+++ b/relay-rust/src/main.rs +++ gnirehtet/relay-rust/src/main.rs
@@ -299,7 +299,7 @@ impl Command for RelayCommand { @@ -299,7 +299,7 @@ impl Command for RelayCommand {
fn cmd_install(serial: Option<&String>) -> Result<(), CommandExecutionError> { fn cmd_install(serial: Option<&String>) -> Result<(), CommandExecutionError> {
@ -11,7 +11,7 @@ index 4f1be53..96d2e78 100644
} }
fn cmd_uninstall(serial: Option<&String>) -> Result<(), CommandExecutionError> { fn cmd_uninstall(serial: Option<&String>) -> Result<(), CommandExecutionError> {
@@ -467,8 +467,8 @@ fn exec_adb<S: Into<String>>( @@ -464,8 +464,8 @@ fn exec_adb<S: Into<String>>(
args: Vec<S>, args: Vec<S>,
) -> Result<(), CommandExecutionError> { ) -> Result<(), CommandExecutionError> {
let adb_args = create_adb_args(serial, args); let adb_args = create_adb_args(serial, args);
@ -22,7 +22,7 @@ index 4f1be53..96d2e78 100644
Ok(exit_status) => { Ok(exit_status) => {
if exit_status.success() { if exit_status.success() {
Ok(()) Ok(())
@@ -490,8 +490,8 @@ fn must_install_client(serial: Option<&String>) -> Result<bool, CommandExecution @@ -487,8 +487,8 @@ fn must_install_client(serial: Option<&S
serial, serial,
vec!["shell", "dumpsys", "package", "com.genymobile.gnirehtet"], vec!["shell", "dumpsys", "package", "com.genymobile.gnirehtet"],
); );
@ -33,3 +33,16 @@ index 4f1be53..96d2e78 100644
Ok(output) => { Ok(output) => {
if output.status.success() { if output.status.success() {
// the "regex" crate makes the binary far bigger, so just parse the versionCode // the "regex" crate makes the binary far bigger, so just parse the versionCode
Index: gnirehtet/relay-rust/src/adb_monitor.rs
===================================================================
--- gnirehtet.orig/relay-rust/src/adb_monitor.rs
+++ gnirehtet/relay-rust/src/adb_monitor.rs
@@ -206,7 +206,7 @@ impl AdbMonitor {
fn start_adb_daemon() -> bool {
info!(target: TAG, "Restarting adb daemon");
- match process::Command::new("adb")
+ match process::Command::new("@adb@")
.args(&["start-server"])
.status() {
Ok(exit_status) => {