ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 06:47:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #136426 from VergeDX/qv2ray

Browse Source 
qv2ray: 2.6.3 -> 2.7.0
This commit is contained in:
Bobby Rong 2021-09-19 20:08:51 +08:00 committed by GitHub
commit 81f4b2aadd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/networking/qv2ray/default.nix
View File

@ -1,10 +1,11 @@
{ lib { lib
, stdenv
, mkDerivation , mkDerivation
, fetchFromGitHub , fetchFromGitHub
, qmake , qmake
, qttools , qttools
, cmake , cmake
, clang , clang_8
, grpc , grpc
, protobuf , protobuf
, openssl , openssl
@ -13,20 +14,26 @@
, abseil-cpp , abseil-cpp
, libGL , libGL
, zlib , zlib
, curl
}: }:
mkDerivation rec { mkDerivation rec {
pname = "qv2ray"; pname = "qv2ray";
version = "2.6.3"; version = "2.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Qv2ray"; owner = "Qv2ray";
repo = "Qv2ray"; repo = "Qv2ray";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-zf3IlpRbZGDZMEny0jp7S+kWtcE1Z10U9GzKC0W0mZI="; sha256 = "sha256-afFTGX/zrnwq/p5p1kj+ANU4WeN7jNq3ieeW+c+GO5M=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patchPhase = lib.optionals stdenv.isDarwin ''
substituteInPlace cmake/platforms/macos.cmake \
--replace \''${QV2RAY_QtX_DIR}/../../../bin/macdeployqt macdeployqt
'';
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_BUILD_TYPE=Release"
"-DQV2RAY_DISABLE_AUTO_UPDATE=on" "-DQV2RAY_DISABLE_AUTO_UPDATE=on"
@ -50,10 +57,14 @@ mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
clang
# The default clang_7 will result in reproducible ICE.
clang_8
pkg-config pkg-config
qmake qmake
qttools qttools
curl
]; ];
meta = with lib; { meta = with lib; {