movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: add missing include and remove update-resolv-conf.sh unwrap

Browse source
This commit is contained in:
sund3RRR 2025-04-19 18:37:33 +03:00
parent c2c0c7186c
commit 8fbc788641
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
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,
@ -64,6 +65,15 @@ stdenv.mkDerivation (finalAttrs: {
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 {