Unverified Commit 21c17995 authored by K900's avatar K900 Committed by GitHub
Browse files

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

parents 9c53a432 8fbc7886

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

+12 −7
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch,

  cmake,

  pkg-config,

  kdePackages,
@@ -54,16 +55,25 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "amnezia-vpn";

  version = "4.8.5.0";

  version = "4.8.6.0";



  src = fetchFromGitHub {

    owner = "amnezia-vpn";

    repo = "amnezia-client";

    tag = finalAttrs.version;

    hash = "sha256-k0BroQYrmJzM0+rSZMf20wHba5NbOK/xm5lbUFBNEHI=";

    hash = "sha256-WQbay3dtGNPPpcK1O7bfs/HKO4ytfmQo60firU/9o28=";

    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 {