From f34a492c5f9bf3bf155c1d4c5de450dc897c4358 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 7 Jun 2025 18:00:28 +0200
Subject: [PATCH 1/9] vintagestory: remove redundant string append

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

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index f2ea4e54f62f..2e3af6ae08ea 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -82,11 +82,11 @@ stdenv.mkDerivation rec {
       makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory \
         --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
         --add-flags $out/share/vintagestory/Vintagestory.dll
+
       makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory-server \
         --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
         --add-flags $out/share/vintagestory/VintagestoryServer.dll
-    ''
-    + ''
+
       find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do
         local filename="$(basename -- "$file")"
         ln -sf "$filename" "''${file%/*}"/"''${filename,,}"

From 36bfba5d65cc1aa744de16a0a1439deffdc9e65d Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 7 Jun 2025 18:02:58 +0200
Subject: [PATCH 2/9] vintagestory: remove `with lib`

---
 pkgs/by-name/vi/vintagestory/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 2e3af6ae08ea..5ddb0af88ff2 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -93,11 +93,11 @@ stdenv.mkDerivation rec {
       done
     '';
 
-  meta = with lib; {
+  meta = {
     description = "In-development indie sandbox game about innovation and exploration";
     homepage = "https://www.vintagestory.at/";
-    license = licenses.unfree;
-    maintainers = with maintainers; [
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [
       artturin
       gigglesquid
       niraethm

From 33bf00aae908125ca133bdd7c1737227b03deb45 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 7 Jun 2025 18:03:54 +0200
Subject: [PATCH 3/9] vintagestory: set `meta.sourceProvenance`

---
 pkgs/by-name/vi/vintagestory/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 5ddb0af88ff2..49178fa33008 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -97,6 +97,7 @@ stdenv.mkDerivation rec {
     description = "In-development indie sandbox game about innovation and exploration";
     homepage = "https://www.vintagestory.at/";
     license = lib.licenses.unfree;
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
     maintainers = with lib.maintainers; [
       artturin
       gigglesquid

From 1a07a1cd92afe76a59e2e98f7c8b5c85ecb11c87 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 7 Jun 2025 18:04:12 +0200
Subject: [PATCH 4/9] vintagestory: set `meta.mainProgram`

---
 pkgs/by-name/vi/vintagestory/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 49178fa33008..3e2ad5e408e8 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -103,5 +103,6 @@ stdenv.mkDerivation rec {
       gigglesquid
       niraethm
     ];
+    mainProgram = "vintagestory";
   };
 }

From 82542aa6ba475baa738275b74c22084d151c7c3a Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 7 Jun 2025 18:10:51 +0200
Subject: [PATCH 5/9] vintagestory: set `meta.platforms`

---
 pkgs/by-name/vi/vintagestory/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 3e2ad5e408e8..6b0710ee4ffe 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -98,6 +98,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.vintagestory.at/";
     license = lib.licenses.unfree;
     sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+    platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       artturin
       gigglesquid

From b01cce1e2740dd316950e4d6b0841815edd088b8 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 7 Jun 2025 18:32:33 +0200
Subject: [PATCH 6/9] vintagestory: set mesa_glthread=true by default

---
 pkgs/by-name/vi/vintagestory/package.nix | 27 ++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 6b0710ee4ffe..4e4d4356c237 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -77,21 +77,22 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  preFixup =
-    ''
-      makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory \
-        --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
-        --add-flags $out/share/vintagestory/Vintagestory.dll
+  preFixup = ''
+    makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory \
+      --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
+      --set-default mesa_glthread true \
+      --add-flags $out/share/vintagestory/Vintagestory.dll
 
-      makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory-server \
-        --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
-        --add-flags $out/share/vintagestory/VintagestoryServer.dll
+    makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory-server \
+      --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
+      --set-default mesa_glthread true \
+      --add-flags $out/share/vintagestory/VintagestoryServer.dll
 
-      find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do
-        local filename="$(basename -- "$file")"
-        ln -sf "$filename" "''${file%/*}"/"''${filename,,}"
-      done
-    '';
+    find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do
+      local filename="$(basename -- "$file")"
+      ln -sf "$filename" "''${file%/*}"/"''${filename,,}"
+    done
+  '';
 
   meta = {
     description = "In-development indie sandbox game about innovation and exploration";

From 0586368e18d2ff9f9496f821dcf578bd4f06a237 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 7 Jun 2025 18:07:01 +0200
Subject: [PATCH 7/9] vintagestory: add dtomvan as maintainer

---
 pkgs/by-name/vi/vintagestory/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 4e4d4356c237..a875aaa752b1 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -104,6 +104,7 @@ stdenv.mkDerivation rec {
       artturin
       gigglesquid
       niraethm
+      dtomvan
     ];
     mainProgram = "vintagestory";
   };

From c09adca78b0af13a343263d577b54e0525a4c07f Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Mon, 9 Jun 2025 02:55:46 +0200
Subject: [PATCH 8/9] vintagestory: 1.20.11 -> 1.20.12

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

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index a875aaa752b1..833c0d51e67c 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "vintagestory";
-  version = "1.20.11";
+  version = "1.20.12";
 
   src = fetchurl {
     url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
-    hash = "sha256-IOreg6j/jLhOK8jm2AgSnYQrql5R6QxsshvPs8OUcQA=";
+    hash = "sha256-h6YXEZoVVV9IuKkgtK9Z3NTvJogVNHmXdAcKxwfvqcE=";
   };
 
   nativeBuildInputs = [

From 63cc2e2a3638c907e14418eb536c8a4d51caec0c Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 25 Jun 2025 20:34:36 +0200
Subject: [PATCH 9/9] vintagestory: remove unused `buildInputs`

---
 pkgs/by-name/vi/vintagestory/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 833c0d51e67c..928734a145f9 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
     copyDesktopItems
   ];
 
-  buildInputs = [ dotnet-runtime_7 ];
-
   runtimeLibs = lib.makeLibraryPath (
     [
       gtk2