diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json index 36e2cfb6a7d6d..bac9842e17e82 100644 --- a/pkgs/by-name/v2/v2rayn/deps.json +++ b/pkgs/by-name/v2/v2rayn/deps.json @@ -351,8 +351,8 @@ }, { "pname": "YamlDotNet", - "version": "16.2.1", - "hash": "sha256-Nu/rD43sihE4PTHC5r2Ua2gafclqcd2U95RcNFvGFhc=" + "version": "16.3.0", + "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q=" }, { "pname": "ZXing.Net", diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index a85d3802e7bfb..e9ae41775887a 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -11,7 +11,6 @@ openssl, lttng-ust_2_12, krb5, - imagemagick, makeDesktopItem, copyDesktopItems, bash, @@ -19,13 +18,13 @@ }: buildDotnetModule rec { pname = "v2rayn"; - version = "7.4.2"; + version = "7.5.0"; src = fetchFromGitHub { owner = "2dust"; repo = "v2rayN"; tag = version; - hash = "sha256-2L/c0HpHqlRxVBfP4N+lrYs6FWDK9mLpJdSPf+tV+lc="; + hash = "sha256-41vg8CFI5Y421w5J65vxgcHscap/IsiczITEFfLEoX8="; }; projectFile = "v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj"; @@ -50,7 +49,6 @@ buildDotnetModule rec { executables = [ "v2rayN" ]; nativeBuildInputs = [ - imagemagick copyDesktopItems autoPatchelfHook ]; @@ -75,24 +73,6 @@ buildDotnetModule rec { xorg.libXext ]; - postBuild = - let - selectSystem = - attrs: - attrs.${stdenv.hostPlatform.system} - or (throw "v2rayn: ${stdenv.hostPlatform.system} is not supported"); - arch = selectSystem { - x86_64-linux = "x64"; - aarch64-linux = "arm64"; - }; - in - '' - mv ./v2rayN/v2rayN.Desktop/bin/Release/net8.0/linux-${arch} ./v2rayN/v2rayN.Desktop/bin/Release/v2rayn - rm -r ./v2rayN/v2rayN.Desktop/bin/Release/net8.0 - mv ./v2rayN/v2rayN.Desktop/bin/Release/v2rayn ./v2rayN/v2rayN.Desktop/bin/Release/net8.0 - ln -s . ./v2rayN/v2rayN.Desktop/bin/Release/net8.0/linux-${arch} - ''; - desktopItems = [ (makeDesktopItem { name = "v2rayn"; @@ -100,12 +80,17 @@ buildDotnetModule rec { icon = "v2rayn"; genericName = "v2rayN"; desktopName = "v2rayN"; + categories = [ + "Network" + "Application" + ]; + terminal = false; + comment = "A GUI client for Windows and Linux, support Xray core and sing-box-core and others"; }) ]; postInstall = '' - mkdir -p $out/share/pixmaps - magick "v2rayN/v2rayN.Desktop/Assets/v2rayN.ico[11]" $out/share/pixmaps/v2rayn.png + install -Dm644 v2rayN/v2rayN.Desktop/v2rayN.png $out/share/pixmaps/v2rayn.png ''; meta = {