diff options
| author | Vanilla <neko@hydev.org> | 2021-09-02 07:48:41 +0800 |
|---|---|---|
| committer | Vanilla <neko@hydev.org> | 2021-09-18 07:54:52 +0800 |
| commit | dd2d99cab705641876d3f76fb5ea01f9aa6abb0b (patch) | |
| tree | 35e4f72d0aba94e0fa13ff252a18dfc361bc193f /pkgs/applications/networking/qv2ray | |
| parent | 788dffdfd8ea1e5c4c80f32addf0198602da48ee (diff) | |
| download | nixpkgs-dd2d99cab705641876d3f76fb5ea01f9aa6abb0b.tar nixpkgs-dd2d99cab705641876d3f76fb5ea01f9aa6abb0b.tar.gz nixpkgs-dd2d99cab705641876d3f76fb5ea01f9aa6abb0b.tar.bz2 nixpkgs-dd2d99cab705641876d3f76fb5ea01f9aa6abb0b.tar.lz nixpkgs-dd2d99cab705641876d3f76fb5ea01f9aa6abb0b.tar.xz nixpkgs-dd2d99cab705641876d3f76fb5ea01f9aa6abb0b.tar.zst nixpkgs-dd2d99cab705641876d3f76fb5ea01f9aa6abb0b.zip | |
qv2ray: 2.6.3 -> 2.7.0
Diffstat (limited to 'pkgs/applications/networking/qv2ray')
| -rw-r--r-- | pkgs/applications/networking/qv2ray/default.nix | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index 7b97bd8543d..62327a8e9a8 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -1,10 +1,11 @@ { lib +, stdenv , mkDerivation , fetchFromGitHub , qmake , qttools , cmake -, clang +, clang_8 , grpc , protobuf , openssl @@ -13,20 +14,26 @@ , abseil-cpp , libGL , zlib +, curl }: mkDerivation rec { pname = "qv2ray"; - version = "2.6.3"; + version = "2.7.0"; src = fetchFromGitHub { owner = "Qv2ray"; repo = "Qv2ray"; rev = "v${version}"; - sha256 = "sha256-zf3IlpRbZGDZMEny0jp7S+kWtcE1Z10U9GzKC0W0mZI="; + sha256 = "sha256-afFTGX/zrnwq/p5p1kj+ANU4WeN7jNq3ieeW+c+GO5M="; fetchSubmodules = true; }; + patchPhase = lib.optionals stdenv.isDarwin '' + substituteInPlace cmake/platforms/macos.cmake \ + --replace \''${QV2RAY_QtX_DIR}/../../../bin/macdeployqt macdeployqt + ''; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DQV2RAY_DISABLE_AUTO_UPDATE=on" @@ -50,10 +57,14 @@ mkDerivation rec { nativeBuildInputs = [ cmake - clang + + # The default clang_7 will result in reproducible ICE. + clang_8 + pkg-config qmake qttools + curl ]; meta = with lib; { |