-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
amneziaVPN: init at 4.8.2.3; nixos/programs/amneziaVPN: init
- Loading branch information
Showing
5 changed files
with
268 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
{ | ||
config, | ||
lib, | ||
pkgs, | ||
... | ||
}: | ||
let | ||
cfg = config.programs.amnezia-vpn; | ||
in | ||
{ | ||
options.programs.amnezia-vpn = { | ||
enable = lib.mkEnableOption "The AmneziaVPN client"; | ||
}; | ||
|
||
config = lib.mkIf cfg.enable { | ||
environment.systemPackages = [ pkgs.amnezia-vpn ]; | ||
|
||
services.dbus.packages = [ pkgs.amnezia-vpn ]; | ||
services.resolved.enable = true; | ||
|
||
systemd = { | ||
services.amnezia-vpn = { | ||
description = "AmneziaVPN Service"; | ||
after = [ "network.target" ]; | ||
startLimitIntervalSec = 0; | ||
serviceConfig = { | ||
Type = "simple"; | ||
Restart = "always"; | ||
RestartSec = 1; | ||
ExecStart = "${pkgs.amnezia-vpn}/bin/AmneziaVPN-service"; | ||
}; | ||
wantedBy = [ "multi-user.target" ]; | ||
}; | ||
}; | ||
}; | ||
|
||
meta.maintainers = with lib.maintainers; [ sund3RRR ]; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,173 @@ | ||
{ | ||
lib, | ||
stdenv, | ||
fetchFromGitHub, | ||
cmake, | ||
pkg-config, | ||
kdePackages, | ||
qt6, | ||
libsecret, | ||
xdg-utils, | ||
amneziawg-go, | ||
openvpn, | ||
shadowsocks-rust, | ||
cloak-pt, | ||
wireguard-tools, | ||
busybox, | ||
sudo, | ||
libssh, | ||
zlib, | ||
tun2socks, | ||
xray, | ||
}: | ||
let | ||
amnezia-tun2socks = tun2socks.overrideAttrs ( | ||
finalAttrs: prevAttrs: { | ||
pname = "amnezia-tun2socks"; | ||
version = "2.5.4"; | ||
|
||
src = fetchFromGitHub { | ||
owner = "amnezia-vpn"; | ||
repo = "amnezia-tun2socks"; | ||
rev = "v${finalAttrs.version}"; | ||
hash = "sha256-lHo7WtcqccBSHly6neuksh1gC7RCKxbFNX9KSKNNeK8="; | ||
}; | ||
|
||
vendorHash = "sha256-VvOaTJ6dBFlbGZGxnHy2sCtds1tyhu6VsPewYpsDBiM="; | ||
|
||
ldflags = [ | ||
"-w" | ||
"-s" | ||
"-X github.com/amnezia-vpn/amnezia-tun2socks/v2/internal/version.Version=v${finalAttrs.version}" | ||
"-X github.com/amnezia-vpn/amnezia-tun2socks/v2/internal/version.GitCommit=v${finalAttrs.version}" | ||
]; | ||
} | ||
); | ||
|
||
amnezia-xray = xray.overrideAttrs ( | ||
finalAttrs: prevAttrs: { | ||
pname = "amnezia-xray"; | ||
version = "1.8.13"; | ||
|
||
src = fetchFromGitHub { | ||
owner = "amnezia-vpn"; | ||
repo = "amnezia-xray-core"; | ||
rev = "v${finalAttrs.version}"; | ||
hash = "sha256-7XYdogoUEv3kTPTOQwRCohsPtfSDf+aRdI28IkTjvPk="; | ||
}; | ||
|
||
vendorHash = "sha256-zArdGj5yeRxU0X4jNgT5YBI9SJUyrANDaqNPAPH3d5M="; | ||
} | ||
); | ||
in | ||
stdenv.mkDerivation (finalAttrs: { | ||
pname = "amnezia-vpn"; | ||
version = "4.8.2.3"; | ||
|
||
src = fetchFromGitHub { | ||
owner = "amnezia-vpn"; | ||
repo = "amnezia-client"; | ||
rev = "refs/tags/${finalAttrs.version}"; | ||
hash = "sha256-bCWPyRW2xnnopcwfPHgQrdP85Ct0CDufJRQ1PvCAiDE="; | ||
fetchSubmodules = true; | ||
}; | ||
|
||
patches = [ ./patches/router.patch ]; | ||
|
||
postPatch = | ||
'' | ||
# fix amneziaWG protocol | ||
substituteInPlace client/platforms/linux/daemon/wireguardutilslinux.cpp \ | ||
--replace-fail 'm_tunnel.start(appPath.filePath("../../client/bin/wireguard-go"), wgArgs);' 'm_tunnel.start("${amneziawg-go}/bin/amneziawg-go", wgArgs);' | ||
# fix openvpn, wg-quick and tun2socks executables | ||
# fix SIGSEGV due to missing return value | ||
substituteInPlace client/utilities.cpp \ | ||
--replace-fail 'return Utils::executable("../../client/bin/openvpn", true);' 'return Utils::executable("${openvpn}/bin/openvpn", false);' \ | ||
--replace-fail 'return Utils::executable("../../client/bin/tun2socks", true);' 'return Utils::executable("${amnezia-tun2socks}/bin/amnezia-tun2socks", false);' \ | ||
--replace-fail 'return Utils::usrExecutable("wg-quick");' 'return Utils::executable("${wireguard-tools}/bin/wg-quick", false);' \ | ||
--replace-fail 'QProcess::execute(QString("pkill %1").arg(name));' 'return QProcess::execute(QString("pkill -f %1").arg(name)) == 0;' | ||
# fix xray executable | ||
substituteInPlace client/protocols/xrayprotocol.cpp \ | ||
--replace-fail 'return Utils::executable(QString("xray"), true);' 'return Utils::executable(QString("${amnezia-xray}/bin/xray"), false);' | ||
# fix openvpn over cloak protocol | ||
substituteInPlace client/protocols/openvpnovercloakprotocol.cpp \ | ||
--replace-fail 'return Utils::executable(QString("/ck-client"), true);' 'return Utils::executable(QString("${cloak-pt}/bin/ck-client"), false);' | ||
# fix openvpn over ss protocol | ||
substituteInPlace client/protocols/shadowsocksvpnprotocol.cpp \ | ||
--replace-fail 'return Utils::executable(QString("/ss-local"), true);' 'return Utils::executable(QString("${shadowsocks-rust}/bin/sslocal"), false);' | ||
# fix update-resolv-conf.sh path | ||
substituteInPlace client/configurators/openvpn_configurator.cpp \ | ||
--replace-fail ".arg(qApp->applicationDirPath());" ".arg(\"$out/local/bin\");" | ||
# fix icon path | ||
substituteInPlace client/ui/qautostart.cpp \ | ||
--replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png" | ||
# fix desktop item | ||
substituteInPlace deploy/installer/config/AmneziaVPN.desktop.in \ | ||
--replace-fail "#!/usr/bin/env xdg-open" "#!${xdg-utils}/bin/xdg-open" \ | ||
--replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png" | ||
'' | ||
+ ( | ||
if stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux then | ||
'' | ||
substituteInPlace client/cmake/3rdparty.cmake \ | ||
--replace-fail 'set(LIBSSH_LIB_PATH "''${LIBSSH_ROOT_DIR}/linux/x86_64/libssh.a")' 'set(LIBSSH_LIB_PATH "${libssh}/lib/libssh.so")' \ | ||
--replace-fail 'set(ZLIB_LIB_PATH "''${LIBSSH_ROOT_DIR}/linux/x86_64/libz.a")' 'set(ZLIB_LIB_PATH "${zlib}/lib/libz.so")' \ | ||
--replace-fail 'set(OPENSSL_LIB_SSL_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libssl.a")' 'set(OPENSSL_LIB_SSL_PATH "''${OPENSSL_ROOT_DIR}/linux/arm64/libssl.a")' \ | ||
--replace-fail 'set(OPENSSL_LIB_CRYPTO_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libcrypto.a")' 'set(OPENSSL_LIB_CRYPTO_PATH "''${OPENSSL_ROOT_DIR}/linux/arm64/libcrypto.a")' | ||
'' | ||
else | ||
"" | ||
); | ||
|
||
strictDeps = true; | ||
|
||
nativeBuildInputs = [ | ||
cmake | ||
pkg-config | ||
qt6.wrapQtAppsHook | ||
]; | ||
|
||
buildInputs = [ | ||
libsecret | ||
qt6.qtbase | ||
qt6.qttools | ||
kdePackages.qtremoteobjects | ||
kdePackages.qtsvg | ||
kdePackages.qt5compat | ||
]; | ||
|
||
qtWrapperArgs = [ | ||
''--prefix PATH : ${ | ||
lib.makeBinPath [ | ||
busybox | ||
sudo | ||
] | ||
}'' | ||
]; | ||
|
||
postInstall = '' | ||
# install AmneziaVPN and AmneziaVPN-service | ||
mkdir -p $out/bin | ||
cp client/AmneziaVPN $out/bin/ | ||
cp service/server/AmneziaVPN-service $out/bin/ | ||
# install update-resolv-conf.sh | ||
mkdir -p $out/local/bin | ||
cp ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/local/bin/ | ||
# install .desktop item | ||
mkdir -p $out/share/applications | ||
cp ../AppDir/AmneziaVPN.desktop $out/share/applications/ | ||
# install icon | ||
mkdir -p $out/share/pixmaps/ | ||
cp ../deploy/data/linux/AmneziaVPN.png $out/share/pixmaps/ | ||
''; | ||
|
||
meta = with lib; { | ||
description = "Amnezia VPN Client"; | ||
downloadPage = "https://amnezia.org/en/downloads"; | ||
homepage = "https://amnezia.org/en"; | ||
license = licenses.gpl3; | ||
mainProgram = "AmneziaVPN"; | ||
maintainers = with maintainers; [ sund3RRR ]; | ||
platforms = platforms.unix; | ||
}; | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
--- a/service/server/router_linux.cpp 2025-01-01 11:36:27.615658613 +0300 | ||
+++ b/service/server/router_linux.cpp 2025-01-01 18:07:57.300178080 +0300 | ||
@@ -19,9 +19,27 @@ | ||
#include <stdio.h> | ||
#include <unistd.h> | ||
#include <QFileInfo> | ||
+#include <QStringList> | ||
+#include <QString> | ||
|
||
#include <core/networkUtilities.h> | ||
|
||
+bool isServiceActive(const QString &serviceName) { | ||
+ QProcess process; | ||
+ process.start("systemctl", { "list-units", "--type=service", "--state=running", "--no-legend" }); | ||
+ process.waitForFinished(); | ||
+ | ||
+ QString output = process.readAllStandardOutput(); | ||
+ QStringList services = output.split('\n', Qt::SkipEmptyParts); | ||
+ | ||
+ for (const QString &service : services) { | ||
+ if (service.contains(serviceName)) { | ||
+ return true; | ||
+ } | ||
+ } | ||
+ return false; | ||
+} | ||
+ | ||
RouterLinux &RouterLinux::Instance() | ||
{ | ||
static RouterLinux s; | ||
@@ -158,15 +176,14 @@ | ||
p.setProcessChannelMode(QProcess::MergedChannels); | ||
|
||
//check what the dns manager use | ||
- if (QFileInfo::exists("/usr/bin/nscd") | ||
- || QFileInfo::exists("/usr/sbin/nscd") | ||
- || QFileInfo::exists("/usr/lib/systemd/system/nscd.service")) | ||
- { | ||
- p.start("systemctl restart nscd"); | ||
- } | ||
- else | ||
- { | ||
- p.start("systemctl restart systemd-resolved"); | ||
+ if (isServiceActive("nscd.service")) { | ||
+ qDebug() << "Restarting nscd.service"; | ||
+ p.start("systemctl", { "restart", "nscd" }); | ||
+ } else if (isServiceActive("systemd-resolved.service")) { | ||
+ qDebug() << "Restarting systemd-resolved.service"; | ||
+ p.start("systemctl", { "restart", "systemd-resolved" }); | ||
+ } else { | ||
+ qDebug() << "No suitable DNS manager found."; | ||
} | ||
|
||
p.waitForFinished(); |