Unverified Commit a8c67bc8 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

amnezia-vpn: 4.8.6.0 -> 4.8.8.3 (#425006)

parents 1e13373d b9fa2c75

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

+40 −45
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
  wireguard-tools,

  libssh,

  zlib,

  openssl,

  tun2socks,

  xray,

  nix-update-script,
@@ -41,16 +42,16 @@ let 
  amnezia-xray = xray.overrideAttrs (

    finalAttrs: prevAttrs: {

      pname = "amnezia-xray";

      version = "1.8.13";

      version = "1.8.15";



      src = fetchFromGitHub {

        owner = "amnezia-vpn";

        repo = "amnezia-xray-core";

        tag = "v${finalAttrs.version}";

        hash = "sha256-7XYdogoUEv3kTPTOQwRCohsPtfSDf+aRdI28IkTjvPk=";

        hash = "sha256-3ZGkfGxYl9/yE7Q2CsJkFJ6xSGybBdq3DztQ0f4VsnY=";

      };



      vendorHash = "sha256-zArdGj5yeRxU0X4jNgT5YBI9SJUyrANDaqNPAPH3d5M=";

      vendorHash = "sha256-AimQsuBRhgpTY5rW8WRejCkx4s9Q9n+OuTf4XCrgpnE=";

    }

  );
@@ -64,27 +65,17 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "amnezia-vpn";

  version = "4.8.6.0";

  version = "4.8.8.3";



  src = fetchFromGitHub {

    owner = "amnezia-vpn";

    repo = "amnezia-client";

    tag = finalAttrs.version;

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

    hash = "sha256-hDbrp6eT+avFepJL55Vl2alOD+IMnyy8MPXZQTEmLJo=";

    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 \

      --replace-fail 'm_tunnel.start(appPath.filePath("../../client/bin/wireguard-go"), wgArgs);' 'm_tunnel.start("${amneziawg-go}/bin/amneziawg-go", wgArgs);'

    substituteInPlace client/utilities.cpp \
@@ -106,14 +97,18 @@ stdenv.mkDerivation (finalAttrs: { 
    substituteInPlace deploy/data/linux/AmneziaVPN.service \

      --replace-fail "ExecStart=/opt/AmneziaVPN/service/AmneziaVPN-service.sh" "ExecStart=$out/bin/AmneziaVPN-service" \

      --replace-fail "Environment=LD_LIBRARY_PATH=/opt/AmneziaVPN/client/lib" ""

    ''

    + (lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) ''

    substituteInPlace client/cmake/3rdparty.cmake \

      --replace-fail 'set(LIBSSH_LIB_PATH "''${LIBSSH_ROOT_DIR}/linux/x86_64/libssh.a")' 'set(LIBSSH_LIB_PATH "${libssh}/lib/libssh.so")' \

      --replace-fail 'set(ZLIB_LIB_PATH "''${LIBSSH_ROOT_DIR}/linux/x86_64/libz.a")' 'set(ZLIB_LIB_PATH "${zlib}/lib/libz.so")' \

        --replace-fail 'set(OPENSSL_LIB_SSL_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libssl.a")' 'set(OPENSSL_LIB_SSL_PATH "''${OPENSSL_ROOT_DIR}/linux/arm64/libssl.a")' \

        --replace-fail 'set(OPENSSL_LIB_CRYPTO_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libcrypto.a")' 'set(OPENSSL_LIB_CRYPTO_PATH "''${OPENSSL_ROOT_DIR}/linux/arm64/libcrypto.a")'

    '');

      --replace-fail 'set(OPENSSL_INCLUDE_DIR "''${OPENSSL_ROOT_DIR}/linux/include")' 'set(OPENSSL_INCLUDE_DIR "${openssl.dev}/include")' \

      --replace-fail 'set(OPENSSL_LIB_SSL_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libssl.a")' 'set(OPENSSL_LIB_SSL_PATH "${openssl.out}/lib/libssl.so")' \

      --replace-fail 'set(OPENSSL_LIB_CRYPTO_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libcrypto.a")' 'set(OPENSSL_LIB_CRYPTO_PATH "${openssl.out}/lib/libcrypto.so")' \

      --replace-fail 'set(OPENSSL_USE_STATIC_LIBS TRUE)' 'set(OPENSSL_USE_STATIC_LIBS FALSE)'

    substituteInPlace service/server/CMakeLists.txt \

      --replace-fail 'set(OPENSSL_INCLUDE_DIR "''${OPENSSL_ROOT_DIR}/linux/include")' 'set(OPENSSL_INCLUDE_DIR "${openssl.dev}/include")' \

      --replace-fail 'set(OPENSSL_LIB_CRYPTO_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libcrypto.a")' 'set(OPENSSL_LIB_CRYPTO_PATH "${openssl.out}/lib/libcrypto.so")' \

      --replace-fail 'set(OPENSSL_USE_STATIC_LIBS TRUE)' 'set(OPENSSL_USE_STATIC_LIBS FALSE)'

  '';



  strictDeps = true;