From 9594f70d747d642d761542156d5638c9dae9c1ce Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Tue, 7 Oct 2025 21:41:43 +0100
Subject: [PATCH 1/3] nexusmods-app: switch back to `fetchFromGitHub`

We switched to `fetchgit` because we needed to fetch git-LFS contend for
some tests to build. Since then upstream has stopped using git-LFS and
we have stopped fetching with it enabled, so we can switch back to
`fetchFromGitHub`.

I assume that when we disabled git-LFS, I wasn't aware `fetchFromGitHub`
supported `fetchSubmodules`.
---
 pkgs/by-name/ne/nexusmods-app/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index fdaacf378941..c0248eabfd71 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -5,7 +5,7 @@
   callPackage,
   desktop-file-utils,
   dotnetCorePackages,
-  fetchgit,
+  fetchFromGitHub,
   imagemagick,
   lib,
   xdg-utils,
@@ -25,9 +25,10 @@ buildDotnetModule (finalAttrs: {
   inherit pname;
   version = "0.17.2";
 
-  src = fetchgit {
-    url = "https://github.com/Nexus-Mods/NexusMods.App.git";
-    rev = "refs/tags/v${finalAttrs.version}";
+  src = fetchFromGitHub {
+    owner = "Nexus-Mods";
+    repo = "NexusMods.App";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-2B5n1yN42birMJ1YaUU/KjzhHIJTv8nwrupc0ULc8Hc=";
     fetchSubmodules = true;
   };
@@ -196,7 +197,7 @@ buildDotnetModule (finalAttrs: {
   meta = {
     mainProgram = "NexusMods.App";
     homepage = "https://github.com/Nexus-Mods/NexusMods.App";
-    changelog = "https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/Nexus-Mods/NexusMods.App/releases/tag/${finalAttrs.src.tag}";
     license = [ lib.licenses.gpl3Plus ];
     maintainers = with lib.maintainers; [
       l0b0

From 9c85f55e721a2018155b758d34fd7102f10c1f26 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Tue, 7 Oct 2025 21:46:45 +0100
Subject: [PATCH 2/3] nexusmods-app: drop dead avalonia code

We briefly depended on the avalonia nixpkgs package instead of fetching
it from nuget, however since disabling it we have never re-enabled it.
---
 pkgs/by-name/ne/nexusmods-app/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index c0248eabfd71..26616d5892e4 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -1,6 +1,5 @@
 {
   _7zz,
-  avalonia,
   buildDotnetModule,
   callPackage,
   desktop-file-utils,
@@ -45,11 +44,6 @@ buildDotnetModule (finalAttrs: {
   projectFile = "src/NexusMods.App/NexusMods.App.csproj";
   testProjectFile = "NexusMods.App.sln";
 
-  buildInputs = [
-    # TODO: bump avalonia to 11.1.3
-    # avalonia
-  ];
-
   nativeCheckInputs = [ _7zz ];
 
   nativeBuildInputs = [

From 46b111a2939cb17103c04a7ada75c8333e1e93a4 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Tue, 7 Oct 2025 22:44:29 +0100
Subject: [PATCH 3/3] nexusmods-app: cleanup bitmap icon script

---
 pkgs/by-name/ne/nexusmods-app/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 26616d5892e4..80376f70fe0e 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -101,8 +101,8 @@ buildDotnetModule (finalAttrs: {
 
     # Bitmap icons
     for i in 16 24 48 64 96 128 256 512; do
-      size=''${i}x''${i}
-      dir=$out/share/icons/hicolor/$size/apps
+      size="$i"x"$i"
+      dir="$out/share/icons/hicolor/$size/apps"
       mkdir -p $dir
       magick -background none $icon -resize $size $dir/com.nexusmods.app.png
     done