diff options
| author | Artturi <Artturin@artturin.com> | 2023-01-27 19:18:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-27 19:18:14 +0200 |
| commit | ac33709e05bf5a87b7dc07f47a39369a9f8f37ae (patch) | |
| tree | ebeb87ee4c4e6165d3753d2a2640f10f007d9037 /pkgs/applications/networking/qv2ray | |
| parent | 42bee50625c60896c62fc90805421a8b5d66a25b (diff) | |
| parent | 9044d9d00f4000eee3a5195916ac8228c11f97b6 (diff) | |
| download | nixlib-ac33709e05bf5a87b7dc07f47a39369a9f8f37ae.tar nixlib-ac33709e05bf5a87b7dc07f47a39369a9f8f37ae.tar.gz nixlib-ac33709e05bf5a87b7dc07f47a39369a9f8f37ae.tar.bz2 nixlib-ac33709e05bf5a87b7dc07f47a39369a9f8f37ae.tar.lz nixlib-ac33709e05bf5a87b7dc07f47a39369a9f8f37ae.tar.xz nixlib-ac33709e05bf5a87b7dc07f47a39369a9f8f37ae.tar.zst nixlib-ac33709e05bf5a87b7dc07f47a39369a9f8f37ae.zip | |
Merge pull request #195242 from wineee/qv2ray
Diffstat (limited to 'pkgs/applications/networking/qv2ray')
| -rw-r--r-- | pkgs/applications/networking/qv2ray/default.nix | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index 3e6dfb1a7d22..af0813a46693 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -2,7 +2,7 @@ , stdenv , mkDerivation , fetchFromGitHub -, qmake +, symlinkJoin , qttools , cmake , clang_8 @@ -14,29 +14,40 @@ , libGL , zlib , curl +, v2ray +, v2ray-geoip, v2ray-domain-list-community +, assets ? [ v2ray-geoip v2ray-domain-list-community ] }: mkDerivation rec { pname = "qv2ray"; - version = "2.7.0"; + version = "unstable-2022-09-25"; src = fetchFromGitHub { owner = "Qv2ray"; repo = "Qv2ray"; - rev = "v${version}"; - sha256 = "sha256-afFTGX/zrnwq/p5p1kj+ANU4WeN7jNq3ieeW+c+GO5M="; + rev = "fb44fb1421941ab192229ff133bc28feeb4a8ce5"; + sha256 = "sha256-TngDgLXKyAoQFnXpBNaz4QjfkVwfZyuQwatdhEiI57U="; fetchSubmodules = true; }; - patchPhase = lib.optionals stdenv.isDarwin '' + postPatch = lib.optionals stdenv.isDarwin '' substituteInPlace cmake/platforms/macos.cmake \ --replace \''${QV2RAY_QtX_DIR}/../../../bin/macdeployqt macdeployqt ''; + assetsDrv = symlinkJoin { + name = "v2ray-assets"; + paths = assets; + }; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DQV2RAY_DISABLE_AUTO_UPDATE=on" + "-DQV2RAY_USE_V5_CORE=on" "-DQV2RAY_TRANSLATION_PATH=${placeholder "out"}/share/qv2ray/lang" + "-DQV2RAY_DEFAULT_VASSETS_PATH='${assetsDrv}/share/v2ray'" + "-DQV2RAY_DEFAULT_VCORE_PATH='${v2ray}/bin/v2ray'" ]; preConfigure = '' @@ -55,21 +66,17 @@ mkDerivation rec { nativeBuildInputs = [ cmake - - # The default clang_7 will result in reproducible ICE. - clang_8 - pkg-config - qmake qttools curl - ]; + # The default clang_7 will result in reproducible ICE. + ] ++ lib.optional (stdenv.isDarwin) clang_8; meta = with lib; { description = "An GUI frontend to v2ray"; - homepage = "https://qv2ray.github.io/en/"; + homepage = "https://qv2ray.net"; license = licenses.gpl3; - maintainers = with maintainers; [ poscat ]; + maintainers = with maintainers; [ poscat rewine ]; platforms = platforms.all; }; } |