Unverified Commit 9a4b519c authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

Merge pull request #247271 from LudovicoPiero/teavpn2 

teavpn2: init at unstable-2023-07-25
parents a224b6d7 286322ca

pkgs/tools/networking/teavpn2/default.nix

0 → 100644
+41 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, substituteAll

, iproute2

}:

stdenv.mkDerivation {

  pname = "teavpn2";

  version = "unstable-2023-07-25";



  src = fetchFromGitHub {

    owner = "TeaInside";

    repo = "teavpn2";

    rev = "b21898d001a2e7b821e045162dd18f13561cb04b";

    hash = "sha256-0/eHK2/+pn6NfawL1xLJv4jDBFvLwELSXNWLUvff1gs=";

  };



  patches = [

    (substituteAll {

      src = ./nix.patch;

      inherit iproute2;

    })

  ];



  installPhase = ''

    runHook preInstall



    install -Dm 0755 teavpn2 $out/bin/teavpn2



    runHook postInstall

  '';



  meta = with lib; {

    description = "An open source VPN Software";

    homepage = "https://github.com/TeaInside/teavpn2";

    license = licenses.gpl2Plus;

    mainProgram = "teavpn2";

    maintainers = with maintainers; [ ludovicopiero ];

    platforms = platforms.linux;

  };

}

pkgs/tools/networking/teavpn2/nix.patch

0 → 100644
+14 −0
Original line number Diff line number Diff line 
diff --git a/src/teavpn2/net/linux/iface.c b/src/teavpn2/net/linux/iface.c

index a77c1c8..e59c901 100644

--- a/src/teavpn2/net/linux/iface.c

+++ b/src/teavpn2/net/linux/iface.c

@@ -327,7 +327,8 @@ static __cold __always_inline const char *find_ip_cmd(void)

 		"/usr/sbin/ip",

 		"/usr/local/bin/ip",

 		"/usr/local/sbin/ip",

-		"/data/data/com.termux/files/usr/bin/ip"

+		"/data/data/com.termux/files/usr/bin/ip",

+		"@iproute2@/bin/ip"

 	};

 

 	for (size_t i = 0; i < (sizeof(ip_bin) / sizeof(*ip_bin)); i++) {

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -13506,6 +13506,8 @@ with pkgs; 














  tea = callPackage ../tools/misc/tea { };



























  teavpn2 = callPackage ../tools/networking/teavpn2 { };



























  inherit (nodePackages) teck-programmer;





























  ted = callPackage ../tools/typesetting/ted { };