mesen: 2.0.0-unstable-2024-12-25 -> 2.0.0-unstable-2025-04-01 (#383102)

pkgs/by-name/me/mesen/deps.json

···
 [
   {
     "pname": "Avalonia",
-    "version": "11.2.0",
-    "hash": "sha256-kG3tnsLdodlvIjYd5feBZ0quGd2FsvV8FIy7uD5UZ5Q="
+    "version": "11.2.4",
+    "hash": "sha256-CcdWUxqd43A4KeY1K4T5M6R1M0zuwdwyd5Qh/BAlNT4="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
···
   },
   {
     "pname": "Avalonia.BuildServices",
-    "version": "0.0.29",
-    "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="
+    "version": "0.0.31",
+    "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.2.0",
-    "hash": "sha256-x6IdcSo3e2Pq/En9/N80HpPblEXSAv51VRlBrF8wlVM="
+    "version": "11.2.3",
+    "hash": "sha256-z3ZHxVSOoOjqq+5G71jnGN1Y0i3YpAkox7cj3lNr6kg="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.2.0",
-    "hash": "sha256-pd/cD82onMZ0iMLl9TOCl35PEvAPbyX2lUj49lrBpOA="
+    "version": "11.2.3",
+    "hash": "sha256-jIJvuYN0iym/WeOC0C7z5xj5kCZSXGoeLQ/q5qQfewM="
   },
   {
     "pname": "Avalonia.Controls.ProportionalStackPanel",
···
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.2.0",
-    "hash": "sha256-+5ISi6WXe8AIjClVo3UqZHgzZpFbMgFk13YvHHhx9MM="
+    "version": "11.2.4",
+    "hash": "sha256-WKTOx7RNSb0fOMg5Za4j+u9DwKXDqVzHwQCEXSm7TFo="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.2.0",
-    "hash": "sha256-k60HGDKnsXiDOnxSH+Hx2ihyqmxSSeWIBJx2XD1ELW0="
+    "version": "11.2.3",
+    "hash": "sha256-DIGkaBff+C3BLwedw5xteR5lfzb6ecxiLt12eJVgLQc="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.2.0",
-    "hash": "sha256-u4CQvG6EdsyaHSWa+Y704sDiWZlqbArB0g4gcoCFwQo="
+    "version": "11.2.4",
+    "hash": "sha256-lw8YFXR/pn0awFvFW+OhjZ2LbHonL6zwqLIz+pQp+Sk="
   },
   {
     "pname": "Avalonia.MarkupExtension",
···
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.2.0",
-    "hash": "sha256-fMikurP2RAnOahZkORxuGOKGn5iQ0saZCEYsvoFiFQI="
+    "version": "11.2.4",
+    "hash": "sha256-MvxivGjYerXcr70JpWe9CCXO6MU9QQgCkmZfjZCFdJM="
   },
   {
     "pname": "Avalonia.ReactiveUI",
-    "version": "11.2.0",
-    "hash": "sha256-6GXX1ZA6gS9CpkQnGepx1PFNoKiwcHQyLSK5qOGmjYo="
+    "version": "11.2.3",
+    "hash": "sha256-NqRetBiFg5gNCS8C0J1JJJsZ4sz+w+GoEegGFddBGDg="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.2.0",
-    "hash": "sha256-QwYY3bpShJ1ayHUx+mjnwaEhCPDzTk+YeasCifAtGzM="
+    "version": "11.2.3",
+    "hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.2.4",
+    "hash": "sha256-mKQVqtzxnZu6p64ZxIHXKSIw3AxAFjhmrxCc5/1VXfc="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.2.0",
-    "hash": "sha256-rNR+l+vLtlzTU+F51FpOi4Ujy7nR5+lbTc3NQte8s/o="
+    "version": "11.2.4",
+    "hash": "sha256-82UQGuCl5hN5kdA3Uz7hptpNnG1EPlSB6k/a6XPSuXI="
   },
   {
     "pname": "Avalonia.Themes.Fluent",
-    "version": "11.2.0",
-    "hash": "sha256-Ate6KC61pwXmTAk5h1uh7rjwAViuiO/qgAVMl3F1BA8="
+    "version": "11.2.4",
+    "hash": "sha256-CPun/JWFCVoGxgMA510/gMP2ZB9aZJ9Bk8yuNjwo738="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.2.0",
-    "hash": "sha256-l88ZX50Nao8wjtRnyZxNFFgRpJ/yxxNki6NY48dyTUg="
+    "version": "11.2.3",
+    "hash": "sha256-UF15yTDzHmqd33siH3TJxmxaonA51dzga+hmCUahn1k="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.2.0",
-    "hash": "sha256-A9PB6Bt61jLdQlMOkchWy/3BwROgxS9BP8FObs/KFiU="
+    "version": "11.2.4",
+    "hash": "sha256-LJSKiLbdof8qouQhN7pY1RkMOb09IiAu/nrJFR2OybY="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.2.0",
-    "hash": "sha256-EP9cCqriEh8d+Wwyv27QGK/CY6w2LcCjtcIv79PZqkM="
+    "version": "11.2.4",
+    "hash": "sha256-qty8D2/HlZz/7MiEhuagjlKlooDoW3fow5yJY5oX4Uk="
   },
   {
     "pname": "CommunityToolkit.Mvvm",
···
   },
   {
     "pname": "HarfBuzzSharp",
-    "version": "7.3.0.2",
-    "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="
+    "version": "7.3.0.3",
+    "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Linux",
-    "version": "7.3.0.2",
-    "hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="
+    "version": "7.3.0.3",
+    "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.macOS",
-    "version": "7.3.0.2",
-    "hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="
+    "version": "7.3.0.3",
+    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
-    "version": "7.3.0.3-preview.2.2",
-    "hash": "sha256-1NlcTnXrWUYZ2r2/N3SPxNIjNcyIpiiv3g7h8XxpNkM="
+    "version": "7.3.0.3",
+    "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Win32",
-    "version": "7.3.0.2",
-    "hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="
+    "version": "7.3.0.3",
+    "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
   },
   {
     "pname": "MicroCom.Runtime",
···
   },
   {
     "pname": "SkiaSharp",
-    "version": "2.88.8",
-    "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
+    "version": "2.88.9",
+    "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Linux",
-    "version": "2.88.8",
-    "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="
+    "version": "2.88.9",
+    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
   },
   {
     "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "2.88.8",
-    "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="
+    "version": "2.88.9",
+    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
   },
   {
     "pname": "SkiaSharp.NativeAssets.WebAssembly",
-    "version": "2.88.8",
-    "hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="
+    "version": "2.88.9",
+    "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "2.88.8",
-    "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="
+    "version": "2.88.9",
+    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
   },
   {
     "pname": "Splat",

pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch

···
-diff --git a/UI/UI.csproj b/UI/UI.csproj
-index 2a0eb78..74751bc 100644
---- a/UI/UI.csproj
-+++ b/UI/UI.csproj
-@@ -90,11 +90,6 @@
- 	  <None Remove="Styles\StartupStyles.xaml" />
- 	  <None Remove="Utilities\DipSwitchDefinitions.xml" />
- 	</ItemGroup>
--	<PropertyGroup>
--		<RestoreSources>
--			https://nuget-feed-nightly.avaloniaui.net/v3/index.json;https://api.nuget.org/v3/index.json
--		</RestoreSources>
--	</PropertyGroup>
- 	<ItemGroup>
- 		<TrimmerRootAssembly Include="Mesen" />
- 		<TrimmerRootAssembly Include="AvaloniaEdit" />

pkgs/by-name/me/mesen/dont-use-nightly-avalonia.patch

···
+diff --git a/UI/UI.csproj b/UI/UI.csproj
+index 7721884..3011ae8 100644
+--- a/UI/UI.csproj
++++ b/UI/UI.csproj
+@@ -90,11 +90,6 @@
+ 	  <None Remove="Styles\StartupStyles.xaml" />
+ 	  <None Remove="Utilities\DipSwitchDefinitions.xml" />
+ 	</ItemGroup>
+-	<PropertyGroup>
+-		<RestoreSources>
+-			https://nuget-feed-nightly.avaloniaui.net/v3/index.json;https://api.nuget.org/v3/index.json
+-		</RestoreSources>
+-	</PropertyGroup>
+ 	<ItemGroup>
+ 		<TrimmerRootAssembly Include="Mesen" />
+ 		<TrimmerRootAssembly Include="AvaloniaEdit" />
+@@ -105,13 +100,13 @@
+ 		<TrimmerRootAssembly Include="Dock.Settings" />
+ 	</ItemGroup>
+   <ItemGroup>
+-    <PackageReference Include="Avalonia" Version="11.3.999-cibuild0054047-alpha" />
++    <PackageReference Include="Avalonia" Version="11.2.4" />
+     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
+-    <PackageReference Include="Avalonia.Desktop" Version="11.3.999-cibuild0054047-alpha" />
++    <PackageReference Include="Avalonia.Desktop" Version="11.2.4" />
+     <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.2.3" />
+     <PackageReference Include="Avalonia.Diagnostics" Version="11.2.3" Condition="'$(OptimizeUi)'!='true'" />
+     <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.3" />
+-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.999-cibuild0054047-alpha" />
++    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.4" />
+     <PackageReference Include="Dock.Avalonia" Version="11.2.0" />
+     <PackageReference Include="Dock.Model.Mvvm" Version="11.2.0" />
+     <PackageReference Include="Dotnet.Bundle" Version="*" />

pkgs/by-name/me/mesen/dont-zip-libraries.patch

···
 diff --git a/UI/Config/ConfigManager.cs b/UI/Config/ConfigManager.cs
-index 56c1ff1..ed5fe8a 100644
+index c3249cf..96c6ae0 100644
 --- a/UI/Config/ConfigManager.cs
 +++ b/UI/Config/ConfigManager.cs
 @@ -51,7 +51,6 @@ namespace Mesen.Config
  			} else {
  				homeFolder = DefaultDocumentsFolder;
  			}
--			Program.ExtractNativeDependencies(homeFolder);
+-			DependencyHelper.ExtractNativeDependencies(homeFolder);
  			_homeFolder = homeFolder;
  			Config.Save();
  		}
 diff --git a/UI/Program.cs b/UI/Program.cs
-index dfc4ba3..632cef2 100644
+index dc923ab..ae7a1cc 100644
 --- a/UI/Program.cs
 +++ b/UI/Program.cs
 @@ -54,8 +54,6 @@ namespace Mesen
···
  
  			if(!File.Exists(ConfigManager.GetConfigFile())) {
 -				//Could not find configuration file, show wizard
--				ExtractNativeDependencies(ConfigManager.HomeFolder);
+-				DependencyHelper.ExtractNativeDependencies(ConfigManager.HomeFolder);
  				App.ShowConfigWindow = true;
  				BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, ShutdownMode.OnMainWindowClose);
  				if(File.Exists(ConfigManager.GetConfigFile())) {
···
  			Task.Run(() => ConfigManager.LoadConfig());
  
 -			//Extract core dll & other native dependencies
--			ExtractNativeDependencies(ConfigManager.HomeFolder);
+-			DependencyHelper.ExtractNativeDependencies(ConfigManager.HomeFolder);
 -
  			if(CommandLineHelper.IsTestRunner(args)) {
  				return TestRunner.Run(args);
  			}
-@@ -147,7 +142,7 @@ namespace Mesen
+@@ -105,7 +100,7 @@ namespace Mesen
  						libraryName = libraryName + ".dylib";
  					}
  				}
···
  			return IntPtr.Zero;
  		}
 diff --git a/UI/UI.csproj b/UI/UI.csproj
-index 053d495..2a0eb78 100644
+index 67fe57d..65762d3 100644
 --- a/UI/UI.csproj
 +++ b/UI/UI.csproj
-@@ -634,7 +634,6 @@
+@@ -637,7 +637,6 @@
      <EmbeddedResource Include="Debugger\Utilities\LuaScripts\NtscSafeArea.lua" />
      <EmbeddedResource Include="Debugger\Utilities\LuaScripts\NesPianoRoll.lua" />
      <EmbeddedResource Include="Debugger\Utilities\LuaScripts\ReverseMode.lua" />
···
      <EmbeddedResource Include="Localization\resources.en.xml" WithCulture="false" Type="Non-Resx" />
      <EmbeddedResource Include="Utilities\DipSwitchDefinitions.xml" />
    </ItemGroup>
-@@ -644,16 +643,5 @@
+@@ -647,16 +646,4 @@
      </AvaloniaXaml>
    </ItemGroup>
  
···
 -    <Exec Command="cd $(OutDir)&#xD;&#xA;rd Dependencies /s /q&#xD;&#xA;md Dependencies&#xD;&#xA;xcopy /s $(ProjectDir)Dependencies\* Dependencies&#xD;&#xA;copy libHarfBuzzSharp.dll Dependencies&#xD;&#xA;copy libSkiaSharp.dll Dependencies&#xD;&#xA;copy MesenCore.dll Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;del ..\Dependencies.zip&#xD;&#xA;powershell Compress-Archive -Path * -DestinationPath '..\Dependencies.zip' -Force&#xD;&#xA;copy ..\Dependencies.zip $(ProjectDir)" />
 -  </Target>
 -
--	<Target Name="PreBuildLinux" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='linux-x64'">
+-	<Target Name="PreBuildLinux" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='linux-x64' Or '$(RuntimeIdentifier)'=='linux-arm64'">
 -    <Exec Command="cd $(OutDir)&#xD;&#xA;rm -rf Dependencies&#xD;&#xA;mkdir Dependencies&#xD;&#xA;cp -R $(ProjectDir)/Dependencies/* Dependencies&#xD;&#xA;cp libHarfBuzzSharp.so Dependencies&#xD;&#xA;cp libSkiaSharp.so Dependencies&#xD;&#xA;cp MesenCore.so Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;rm ../Dependencies.zip&#xD;&#xA;zip -r ../Dependencies.zip *&#xD;&#xA;cp ../Dependencies.zip $(ProjectDir)" />
 -  </Target>
 -  
 -	<Target Name="PreBuildOsx" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='osx-x64' Or '$(RuntimeIdentifier)'=='osx-arm64'">
 -    <Exec Command="cp ./Assets/MesenIcon.icns $(OutDir)&#xD;&#xA;cd $(OutDir)&#xD;&#xA;rm -R Dependencies&#xD;&#xA;mkdir Dependencies&#xD;&#xA;cp -R $(ProjectDir)/Dependencies/* Dependencies&#xD;&#xA;cp libHarfBuzzSharp.dylib Dependencies&#xD;&#xA;cp libSkiaSharp.dylib Dependencies&#xD;&#xA;cp MesenCore.dylib Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;rm ../Dependencies.zip&#xD;&#xA;zip -r ../Dependencies.zip *&#xD;&#xA;cp ../Dependencies.zip $(ProjectDir)" />
 -  </Target>
- 
+-
  </Project>
-

pkgs/by-name/me/mesen/package.nix

···
   fetchFromGitHub,
   wrapGAppsHook3,
   gtk3,
+  libX11,
   SDL2,
 }:
 
 buildDotnetModule rec {
   pname = "mesen";
-  version = "2.0.0-unstable-2024-12-25";
+  version = "2.0.0-unstable-2025-04-01";
 
   src = fetchFromGitHub {
     owner = "SourMesen";
     repo = "Mesen2";
-    rev = "6820db37933002089a04d356d8469481e915a359";
-    hash = "sha256-TzGMZr351XvVj/wARWJxRisRb5JlkyzdjCVYbwydBVE=";
+    rev = "0dfdbbdd9b5bc4c5d501ea691116019266651aff";
+    hash = "sha256-+Jzw1tfdiX2EmQIoPuMtLmJrv9nx/XqfyLEBW+AXj1I=";
   };
 
   patches = [
-    # the nightly avalonia repository url is still queried, which errors out
-    # even if we don't actually need any nightly versions
-    ./dont-use-alternative-restore-sources.patch
+    # patch out the usage of nightly avalonia builds, since we can't use alternative restore sources
+    ./dont-use-nightly-avalonia.patch
     # upstream has a weird library loading mechanism, which we override with a more sane alternative
     ./dont-zip-libraries.patch
   ];
···
 
     nativeBuildInputs = [ SDL2 ];
 
-    buildInputs = [ SDL2 ];
+    buildInputs = [ SDL2 ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ libX11 ];
 
     makeFlags = [ "core" ];