diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-05-10 15:10:36 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-10 15:10:36 +0300 |
commit | 88cb27db9f5bfb6b515fa5ff75179d4313a0cd0f (patch) | |
tree | f3ee741c339094e19886e1e6b6b1c323053e01c7 /pkgs/development/mobile | |
parent | 9b5bd90d79ac3ed80e766a6abd953ce208c3184d (diff) | |
parent | ce10c265e5ca31edcf6b570099e317325572e2e9 (diff) | |
download | nixlib-88cb27db9f5bfb6b515fa5ff75179d4313a0cd0f.tar nixlib-88cb27db9f5bfb6b515fa5ff75179d4313a0cd0f.tar.gz nixlib-88cb27db9f5bfb6b515fa5ff75179d4313a0cd0f.tar.bz2 nixlib-88cb27db9f5bfb6b515fa5ff75179d4313a0cd0f.tar.lz nixlib-88cb27db9f5bfb6b515fa5ff75179d4313a0cd0f.tar.xz nixlib-88cb27db9f5bfb6b515fa5ff75179d4313a0cd0f.tar.zst nixlib-88cb27db9f5bfb6b515fa5ff75179d4313a0cd0f.zip |
Merge pull request #231040 from Aleksanaa/adbfs-rootless
adbfs-rootless: 2016-10-02 -> unstable-2023-03-21
Diffstat (limited to 'pkgs/development/mobile')
-rw-r--r-- | pkgs/development/mobile/adbfs-rootless/default.nix | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index 85bf2fb44906..cba73e23fd9c 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -1,42 +1,43 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, fuse, adb }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, fuse +, android-tools +}: stdenv.mkDerivation rec { pname = "adbfs-rootless"; - version = "2016-10-02"; + version = "unstable-2023-03-21"; src = fetchFromGitHub { owner = "spion"; - repo = "adbfs-rootless"; - rev = "b58963430e40c9246710a16cec58e7ffc88baa48"; - sha256 = "1kjibl86k6pf7vciwaaxwv5m4q28zdpd2g7yhp71av32jq6j3wm8"; + repo = pname; + rev = "fd56381af4dc9ae2f09b904c295686871a46ed0f"; + sha256 = "atiVjRfqvhTlm8Q+3iTNNPQiNkLIaHDLg5HZDJvpl2Q="; }; - patches = [ - (fetchpatch { - # https://github.com/spion/adbfs-rootless/issues/14 - url = "https://github.com/kronenpj/adbfs-rootless/commit/35f87ce0a7aeddaaad118daed3022e01453b838d.patch"; - sha256 = "1iigla74n3hphnyx9ffli9wqk7v71ylvsxama868czlg7851jqj9"; - }) - ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ fuse ]; postPatch = '' # very ugly way of replacing the adb calls - sed -e 's|"adb |"${adb}/bin/adb |g' \ - -i adbfs.cpp + substituteInPlace adbfs.cpp \ + --replace '"adb ' '"${android-tools}/bin/adb ' ''; installPhase = '' + runHook preInstall install -D adbfs $out/bin/adbfs + runHook postInstall ''; meta = with lib; { description = "Mount Android phones on Linux with adb, no root required"; inherit (src.meta) homepage; license = licenses.bsd3; - maintainers = with maintainers; [ Profpatsch ]; - platforms = platforms.linux; + maintainers = with maintainers; [ Profpatsch aleksana ]; + platforms = platforms.unix; }; } |