From 359bf591360631e43e1730d0bf15b4630fe1b648 Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Sat, 9 May 2026 17:06:53 +0200
Subject: [PATCH] vgmtrans: 1.2 -> 1.3, fix build failure due to minizip-ng

Special thanks to Michael, who found the evaluation issue in meta.licenses

Co-authored-by: Michael Daniels <nix@mdaniels.me>
---
 pkgs/by-name/vg/vgmtrans/package.nix | 41 ++++++++++++++--------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/vg/vgmtrans/package.nix b/pkgs/by-name/vg/vgmtrans/package.nix
index 33fb25677e7e..1c372c637384 100644
--- a/pkgs/by-name/vg/vgmtrans/package.nix
+++ b/pkgs/by-name/vg/vgmtrans/package.nix
@@ -2,36 +2,27 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   cmake,
   ninja,
   qt6,
   spdlog,
-  zlib-ng,
-  minizip-ng,
+  zlib,
   libbass,
   libbassmidi,
+  xz,
+  libchdr,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vgmtrans";
-  version = "1.2";
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "vgmtrans";
     repo = "vgmtrans";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HVC45B1DFThZRkPVrroiay+9ufkOrTMUZoNIuC1CjjM=";
+    hash = "sha256-eI+AFZtw8+IND6bLytUZN7lPHe03LoqLnpP6SCnvQyQ=";
   };
 
-  patches = [
-    # https://github.com/vgmtrans/vgmtrans/pull/567
-    (fetchpatch2 {
-      name = "fix-version-string.patch";
-      url = "https://github.com/vgmtrans/vgmtrans/commit/5ad8a60a19476d2ae9a7c409b83ab6d5e1ff827f.patch?full_index=1";
-      hash = "sha256-I5ykYzj3tUBQ2e3TAnCm5Ry1Hmmi2IVneFQCe5/JV/A=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     ninja
@@ -43,22 +34,30 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qtsvg
     libbass
     libbassmidi
+    xz
+    zlib
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "USE_SYSTEM_ZLIB" true)
   ];
 
   preConfigure = ''
-    rm -r lib/{spdlog,zlib-ng,minizip-ng}
+    rm -r lib/{spdlog,libchdr}
     ln -s ${spdlog.src} lib/spdlog
-    ln -s ${zlib-ng.src} lib/zlib-ng
-    ln -s ${minizip-ng.src} lib/minizip-ng
+    ln -s ${libchdr.src} lib/libchdr
+    tar xzf ${zlib.src} --strip-components=1 -C lib/zlib
   '';
 
   meta = {
     description = "Tool to convert proprietary, sequenced videogame music to industry-standard formats";
     homepage = "https://github.com/vgmtrans/vgmtrans";
-    license = with lib.licenses; [
-      zlib
-      libpng
-      bsd3 # oki_adpcm_state
+    license = [
+      # it has been previously observed that package inputs will override licenses with the same name
+      # it is imperative to not use `with lib.license` here.
+      lib.licenses.zlib
+      lib.licenses.libpng
+      lib.licenses.bsd3 # oki_adpcm_state
     ];
     # See CMakePresets.json
     platforms = [