v2raya: make code more readable

1 files changed, 15 insertions, 4 deletions

diff --git a/pkgs/tools/networking/v2raya/default.nix b/pkgs/tools/networking/v2raya/default.nix
index 23ba50cc7cb1b..45a7838b2f6e6 100644
--- a/pkgs/tools/networking/v2raya/default.nix
+++ b/pkgs/tools/networking/v2raya/default.nix
@@ -11,12 +11,14 @@
 let
   pname = "v2raya";
   version = "2.0.0";
+
   src = fetchFromGitHub {
     owner = "v2rayA";
     repo = "v2rayA";
     rev = "v${version}";
     sha256 = "sha256-1fWcrMd+TSrlS1H0z7XwVCQzZAa8DAFtlekEZNRMAPA=";
   };
+
   web = mkYarnPackage {
     inherit pname version;
     src = "${src}/gui";
@@ -32,21 +34,32 @@ let
     dontInstall = true;
     dontFixup = true;
   };
+
+  assetsDir = symlinkJoin {
+    name = "assets";
+    paths = [ v2ray-geoip v2ray-domain-list-community ];
+  };
+
 in
 buildGoModule {
   inherit pname version;
+
   src = "${src}/service";
   vendorSha256 = "sha256-Ud4pwS0lz7zSTowg3gXNllfDyj8fu33H1L20szxPcOA=";
+
   ldflags = [
     "-s"
     "-w"
     "-X github.com/v2rayA/v2rayA/conf.Version=${version}"
   ];
+
   subPackages = [ "." ];
+
   nativeBuildInputs = [ makeWrapper ];
   preBuild = ''
     cp -a ${web} server/router/web
   '';
+
   postInstall = ''
     install -Dm 444 ${src}/install/universal/v2raya.desktop -t $out/share/applications
     install -Dm 444 ${src}/install/universal/v2raya.png -t $out/share/icons/hicolor/512x512/apps
@@ -55,11 +68,9 @@ buildGoModule {
 
     wrapProgram $out/bin/v2rayA \
       --prefix PATH ":" "${lib.makeBinPath [ v2ray ]}" \
-      --prefix XDG_DATA_DIRS ":" ${symlinkJoin {
-        name = "assets";
-        paths = [ v2ray-geoip v2ray-domain-list-community ];
-      }}/share
+      --prefix XDG_DATA_DIRS ":" ${assetsDir}/share
   '';
+
   meta = with lib; {
     description = "A Linux web GUI client of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel";
     homepage = "https://github.com/v2rayA/v2rayA";