From 1076eab2286c5d5ce6ef43910c582b8dbe6809c5 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 14 Jun 2026 00:46:07 +0200 Subject: [PATCH] libvgm: 0-unstable-2026-04-06 -> 0-unstable-2026-06-07, vgmplay-libvgm: 0.52.0-unstable-2026-01-31 -> 0.52.0-unstable-2026-06-07 Internals of the latter is more deeply connected to the former than other reverse deps, so these bumps need to happen together. Co-authored-by: R. Ryantm --- pkgs/by-name/li/libvgm/package.nix | 6 +++--- pkgs/by-name/vg/vgmplay-libvgm/package.nix | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/li/libvgm/package.nix b/pkgs/by-name/li/libvgm/package.nix index c6776d0c49da..a972536d31a3 100644 --- a/pkgs/by-name/li/libvgm/package.nix +++ b/pkgs/by-name/li/libvgm/package.nix @@ -38,13 +38,13 @@ assert enableTools -> enableAudio && enableEmulation && enableLibplayer; stdenv.mkDerivation (finalAttrs: { pname = "libvgm"; - version = "0-unstable-2026-04-06"; + version = "0-unstable-2026-06-07"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "d1151884997ba4769b070b7c7aaedeffc60a25fb"; - hash = "sha256-SiOB2M7RNo4S5uIr8wXsZ1UtS2+2N8Tqm5iJ+Am3Ep4="; + rev = "08471963604c29353501439c4d6f97b57bf8b07b"; + hash = "sha256-1ddlxs/iq993DkjfYbdyCESspqfhAnmkjErALczpmdI="; }; outputs = [ diff --git a/pkgs/by-name/vg/vgmplay-libvgm/package.nix b/pkgs/by-name/vg/vgmplay-libvgm/package.nix index af26a0038758..9401b106c985 100644 --- a/pkgs/by-name/vg/vgmplay-libvgm/package.nix +++ b/pkgs/by-name/vg/vgmplay-libvgm/package.nix @@ -12,15 +12,23 @@ stdenv.mkDerivation { pname = "vgmplay-libvgm"; - version = "0.52.0-unstable-2026-01-31"; + version = "0.52.0-unstable-2026-06-07"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "vgmplay-libvgm"; - rev = "2a8f3909bcfca4c595ca71c0f762ff495a29e130"; - hash = "sha256-TJUhE4te/nZOsckgMksWcqawsWR8r3OInJoVrv+NVAQ="; + rev = "01f8136fd5602a0041504d8e2ea15d46fc71b4ba"; + hash = "sha256-1fQgRgJC8wxON3ir8ru5wxVkcIIjMSMftYksHbRxln8="; }; + # We don't want text files in bindir + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'install(FILES "''${SRC}" RENAME "''${DST}" DESTINATION "''${CMAKE_INSTALL_BINDIR}")' \ + 'install(FILES "''${SRC}" RENAME "''${DST}" DESTINATION "''${CMAKE_INSTALL_DATADIR}/vgmplay")' + ''; + nativeBuildInputs = [ cmake pkg-config @@ -32,14 +40,6 @@ stdenv.mkDerivation { inih ]; - # https://github.com/ValleyBell/vgmplay-libvgm/issues/9 - # Leftover that's still in use, missing documentation & integration into CMake script rn - env.NIX_CFLAGS_COMPILE = "-DSHARE_PREFIX=\"${placeholder "out"}\""; - - postInstall = '' - install -Dm644 ../VGMPlay.ini $out/share/vgmplay/VGMPlay.ini - ''; - passthru.updateScript = unstableGitUpdater { url = "https://github.com/ValleyBell/vgmplay-libvgm.git"; };