lol

v2raya: make code more readable

Elliot 42f462e3 3705e7a9

+15 -4
+15 -4
pkgs/tools/networking/v2raya/default.nix
··· 11 11 let 12 12 pname = "v2raya"; 13 13 version = "2.0.0"; 14 + 14 15 src = fetchFromGitHub { 15 16 owner = "v2rayA"; 16 17 repo = "v2rayA"; 17 18 rev = "v${version}"; 18 19 sha256 = "sha256-1fWcrMd+TSrlS1H0z7XwVCQzZAa8DAFtlekEZNRMAPA="; 19 20 }; 21 + 20 22 web = mkYarnPackage { 21 23 inherit pname version; 22 24 src = "${src}/gui"; ··· 32 34 dontInstall = true; 33 35 dontFixup = true; 34 36 }; 37 + 38 + assetsDir = symlinkJoin { 39 + name = "assets"; 40 + paths = [ v2ray-geoip v2ray-domain-list-community ]; 41 + }; 42 + 35 43 in 36 44 buildGoModule { 37 45 inherit pname version; 46 + 38 47 src = "${src}/service"; 39 48 vendorSha256 = "sha256-Ud4pwS0lz7zSTowg3gXNllfDyj8fu33H1L20szxPcOA="; 49 + 40 50 ldflags = [ 41 51 "-s" 42 52 "-w" 43 53 "-X github.com/v2rayA/v2rayA/conf.Version=${version}" 44 54 ]; 55 + 45 56 subPackages = [ "." ]; 57 + 46 58 nativeBuildInputs = [ makeWrapper ]; 47 59 preBuild = '' 48 60 cp -a ${web} server/router/web 49 61 ''; 62 + 50 63 postInstall = '' 51 64 install -Dm 444 ${src}/install/universal/v2raya.desktop -t $out/share/applications 52 65 install -Dm 444 ${src}/install/universal/v2raya.png -t $out/share/icons/hicolor/512x512/apps ··· 55 68 56 69 wrapProgram $out/bin/v2rayA \ 57 70 --prefix PATH ":" "${lib.makeBinPath [ v2ray ]}" \ 58 - --prefix XDG_DATA_DIRS ":" ${symlinkJoin { 59 - name = "assets"; 60 - paths = [ v2ray-geoip v2ray-domain-list-community ]; 61 - }}/share 71 + --prefix XDG_DATA_DIRS ":" ${assetsDir}/share 62 72 ''; 73 + 63 74 meta = with lib; { 64 75 description = "A Linux web GUI client of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel"; 65 76 homepage = "https://github.com/v2rayA/v2rayA";