talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

amnezia-vpn: 4.8.5.0 -> 4.8.6.0 (#400099)

Browse Source
This commit is contained in:
K900 2025-04-21 21:02:01 +03:00 committed by GitHub
commit 21c17995f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/by-name/am/amnezia-vpn/package.nix
View File

@ -2,6 +2,7 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
cmake, cmake,
pkg-config, pkg-config,
kdePackages, kdePackages,
@ -54,16 +55,25 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "amnezia-vpn"; pname = "amnezia-vpn";
version = "4.8.5.0"; version = "4.8.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "amnezia-vpn"; owner = "amnezia-vpn";
repo = "amnezia-client"; repo = "amnezia-client";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-k0BroQYrmJzM0+rSZMf20wHba5NbOK/xm5lbUFBNEHI="; hash = "sha256-WQbay3dtGNPPpcK1O7bfs/HKO4ytfmQo60firU/9o28=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
# Temporary patch header file to fix build with QT 6.9
patches = [
(fetchpatch {
name = "add-missing-include.patch";
url = "https://github.com/amnezia-vpn/amnezia-client/commit/c44ce0d77cc3acdf1de48a12459a1a821d404a1c.patch";
hash = "sha256-Q6UMD8PlKAcI6zNolT5+cULECnxNrYrD7cifvNg1ZrY=";
})
];
postPatch = postPatch =
'' ''
substituteInPlace client/platforms/linux/daemon/wireguardutilslinux.cpp \ substituteInPlace client/platforms/linux/daemon/wireguardutilslinux.cpp \
@ -127,11 +137,6 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall runHook postInstall
''; '';
postFixup = ''
# Temporary unwrap non-binary executable until qt6.wrapQtAppsHook is fixed
mv $out/libexec/.update-resolv-conf.sh-wrapped $out/libexec/update-resolv-conf.sh
'';
passthru = { passthru = {
inherit amnezia-tun2socks amnezia-xray; inherit amnezia-tun2socks amnezia-xray;
updateScript = nix-update-script { updateScript = nix-update-script {