From f90cdb6f372fe7b4c4957d2c00d5ec5925e5d67d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 8 Jul 2024 12:16:33 +0200
Subject: [PATCH 1/2] vgm2x: 0.0.0-unstable-2023-08-27 -> 0-unstable-2024-06-18

---
 pkgs/by-name/vg/vgm2x/package.nix | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/vg/vgm2x/package.nix b/pkgs/by-name/vg/vgm2x/package.nix
index ff2fa28e7be7..fab28fb2d550 100644
--- a/pkgs/by-name/vg/vgm2x/package.nix
+++ b/pkgs/by-name/vg/vgm2x/package.nix
@@ -2,32 +2,39 @@
 , lib
 , fetchFromGitHub
 , unstableGitUpdater
-, libfmvoice
-, zlib
+, libarchive
+, libzip
+, pkg-config
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vgm2x";
-  version = "0.0.0-unstable-2023-08-27";
+  version = "0-unstable-2024-06-18";
 
   src = fetchFromGitHub {
     owner = "vampirefrog";
     repo = "vgm2x";
-    rev = "5128055ab2b356e173b53e2afd31202a59505a39";
-    hash = "sha256-DwDcSUdfOsDlajYtzg5xM5P9QPOqLp8b0sEpE18kfzA=";
+    rev = "1c379d74d2365d4478abe25a12572f357d35d576";
+    fetchSubmodules = true;
+    hash = "sha256-lWyOyaV9dDrvGfmCE7m5M8DsxcB8bzJ35Amj3DAOVeA=";
   };
 
   postPatch = ''
-    rmdir libfmvoice
-    cp --no-preserve=all -r ${libfmvoice.src} libfmvoice
+    substituteInPlace Makefile \
+      --replace-fail 'pkg-config' "$PKG_CONFIG"
   '';
 
   strictDeps = true;
 
   enableParallelBuilding = true;
 
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
   buildInputs = [
-    zlib
+    libarchive
+    libzip
   ];
 
   buildFlags = [
@@ -37,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    install -Dm755 vgm2opm $out/bin/vgm2opm
+    install -Dm755 vgm2x $out/bin/vgm2x
 
     runHook postInstall
   '';
@@ -50,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "VGM file extraction tools";
     homepage = "https://github.com/vampirefrog/vgm2x";
     license = licenses.gpl3Only;
-    mainProgram = "vgm2opm";
+    mainProgram = "vgm2x";
     maintainers = with maintainers; [ OPNA2608 ];
     platforms = platforms.all;
   };

From 6b1baf6a6c914c95ca04caf32d0ff4aa0e1d3f73 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 8 Jul 2024 12:17:16 +0200
Subject: [PATCH 2/2] vgm2x: Reformat, drop meta-wide with lib

---
 pkgs/by-name/vg/vgm2x/package.nix | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/vg/vgm2x/package.nix b/pkgs/by-name/vg/vgm2x/package.nix
index fab28fb2d550..8ac19dbde93a 100644
--- a/pkgs/by-name/vg/vgm2x/package.nix
+++ b/pkgs/by-name/vg/vgm2x/package.nix
@@ -1,10 +1,11 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, unstableGitUpdater
-, libarchive
-, libzip
-, pkg-config
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  libarchive,
+  libzip,
+  pkg-config,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -28,18 +29,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [
-    pkg-config
-  ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
     libarchive
     libzip
   ];
 
-  buildFlags = [
-    "CC=${stdenv.cc.targetPrefix}cc"
-  ];
+  buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
 
   installPhase = ''
     runHook preInstall
@@ -53,12 +50,12 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = unstableGitUpdater { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "VGM file extraction tools";
     homepage = "https://github.com/vampirefrog/vgm2x";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     mainProgram = "vgm2x";
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.all;
   };
 })