Skip to content

Commit 21c1799

Browse files
authored
amnezia-vpn: 4.8.5.0 -> 4.8.6.0 (#400099)
2 parents 9c53a43 + 8fbc788 commit 21c1799

1 file changed

Lines changed: 12 additions & 7 deletions

File tree

pkgs/by-name/am/amnezia-vpn/package.nix

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
lib,
33
stdenv,
44
fetchFromGitHub,
5+
fetchpatch,
56
cmake,
67
pkg-config,
78
kdePackages,
@@ -54,16 +55,25 @@ let
5455
in
5556
stdenv.mkDerivation (finalAttrs: {
5657
pname = "amnezia-vpn";
57-
version = "4.8.5.0";
58+
version = "4.8.6.0";
5859

5960
src = fetchFromGitHub {
6061
owner = "amnezia-vpn";
6162
repo = "amnezia-client";
6263
tag = finalAttrs.version;
63-
hash = "sha256-k0BroQYrmJzM0+rSZMf20wHba5NbOK/xm5lbUFBNEHI=";
64+
hash = "sha256-WQbay3dtGNPPpcK1O7bfs/HKO4ytfmQo60firU/9o28=";
6465
fetchSubmodules = true;
6566
};
6667

68+
# Temporary patch header file to fix build with QT 6.9
69+
patches = [
70+
(fetchpatch {
71+
name = "add-missing-include.patch";
72+
url = "https://github.com/amnezia-vpn/amnezia-client/commit/c44ce0d77cc3acdf1de48a12459a1a821d404a1c.patch";
73+
hash = "sha256-Q6UMD8PlKAcI6zNolT5+cULECnxNrYrD7cifvNg1ZrY=";
74+
})
75+
];
76+
6777
postPatch =
6878
''
6979
substituteInPlace client/platforms/linux/daemon/wireguardutilslinux.cpp \
@@ -127,11 +137,6 @@ stdenv.mkDerivation (finalAttrs: {
127137
runHook postInstall
128138
'';
129139

130-
postFixup = ''
131-
# Temporary unwrap non-binary executable until qt6.wrapQtAppsHook is fixed
132-
mv $out/libexec/.update-resolv-conf.sh-wrapped $out/libexec/update-resolv-conf.sh
133-
'';
134-
135140
passthru = {
136141
inherit amnezia-tun2socks amnezia-xray;
137142
updateScript = nix-update-script {

0 commit comments

Comments
 (0)