From fdc86d67de321be06d9c96c5dced29369281bfd5 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Thu, 19 Dec 2024 19:08:53 +0800
Subject: [PATCH] v2rayn: 7.3.2 -> 7.4.1

---
 pkgs/by-name/v2/v2rayn/package.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix
index a5d5596a6746..e0a13d03aedd 100644
--- a/pkgs/by-name/v2/v2rayn/package.nix
+++ b/pkgs/by-name/v2/v2rayn/package.nix
@@ -15,16 +15,17 @@
   makeDesktopItem,
   copyDesktopItems,
   bash,
+  xorg,
 }:
 buildDotnetModule rec {
   pname = "v2rayn";
-  version = "7.3.2";
+  version = "7.4.1";
 
   src = fetchFromGitHub {
     owner = "2dust";
     repo = "v2rayN";
     tag = version;
-    hash = "sha256-mWfWpleUVbq6Z31oh6QoG0j9eT3d7yF6z7e4lRe6+cM=";
+    hash = "sha256-mtmuEwZy72LPYFf7hzE8TYiSh2kK6xe2CRdkOSbg2h4=";
   };
 
   projectFile = "v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj";
@@ -32,14 +33,8 @@ buildDotnetModule rec {
   nugetDeps = ./deps.json;
 
   postPatch = ''
-    substituteInPlace v2rayN/AmazTool/UpgradeApp.cs \
-      --replace-fail "return AppDomain.CurrentDomain.BaseDirectory;" 'return Path.Combine(Environment.GetEnvironmentVariable("XDG_DATA_HOME") ?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share"), "v2rayn");'
-    substituteInPlace v2rayN/ServiceLib/Common/Utils.cs \
-      --replace-fail "return AppDomain.CurrentDomain.BaseDirectory;" 'return Path.Combine(Environment.GetEnvironmentVariable("XDG_DATA_HOME") ?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share"), "v2rayn");'
     substituteInPlace v2rayN/ServiceLib/Common/Utils.cs \
       --replace-fail "/bin/bash" "${bash}/bin/bash"
-    substituteInPlace v2rayN/ServiceLib/ServiceLib.csproj \
-      --replace-fail "0.16.20" "0.16.14"
   '';
 
   dotnetInstallFlags = [ "-p:PublishReadyToRun=false" ];
@@ -66,6 +61,16 @@ buildDotnetModule rec {
     (lib.getLib stdenv.cc.cc)
   ];
 
+  runtimeDeps = [
+    xorg.libX11
+    xorg.libXrandr
+    xorg.libXi
+    xorg.libICE
+    xorg.libSM
+    xorg.libXcursor
+    xorg.libXext
+  ];
+
   postBuild =
     let
       selectSystem =