From 8fbc78864179c76ba9f16b23b03e990320a9547f Mon Sep 17 00:00:00 2001 From: sund3RRR Date: Sat, 19 Apr 2025 18:37:33 +0300 Subject: [PATCH] fix: add missing include and remove update-resolv-conf.sh unwrap --- pkgs/by-name/am/amnezia-vpn/package.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix index 3bf1bd2b3e41..aae7e13c13af 100644 --- a/pkgs/by-name/am/amnezia-vpn/package.nix +++ b/pkgs/by-name/am/amnezia-vpn/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, pkg-config, kdePackages, @@ -64,6 +65,15 @@ stdenv.mkDerivation (finalAttrs: { 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 = '' substituteInPlace client/platforms/linux/daemon/wireguardutilslinux.cpp \ @@ -127,11 +137,6 @@ stdenv.mkDerivation (finalAttrs: { 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 = { inherit amnezia-tun2socks amnezia-xray; updateScript = nix-update-script {