diff options
| author | Cosima Neidahl <opna2608@protonmail.com> | 2024-01-21 19:26:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-21 19:26:23 +0100 |
| commit | 745e7d375797ad052ffafe14f9d50487e60ced9a (patch) | |
| tree | 02e5ddec7528cefc345296d265fa8100870cd11c | |
| parent | e3b1ac0229c99e207be2712db109c964c3b99b5e (diff) | |
| parent | ea74cbe410e4919022fbf546bba1ac51cccb5d22 (diff) | |
Merge pull request #277358 from OPNA2608/update/libvgm
{,vgmplay-}libvgm: Bump to unstable-2023-12-31| -rw-r--r-- | pkgs/applications/audio/mmlgui/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/audio/vgmplay-libvgm/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/libvgm/default.nix | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix index d31ece0187d35..98be95b3bf127 100644 --- a/pkgs/applications/audio/mmlgui/default.nix +++ b/pkgs/applications/audio/mmlgui/default.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { # Don't force building tests substituteInPlace Makefile \ --replace 'all: $(MMLGUI_BIN) test' 'all: $(MMLGUI_BIN)' + + # Breaking change in libvgm + substituteInPlace src/emu_player.cpp \ + --replace 'Resmpl_SetVals(&resmpl, 0xff' 'Resmpl_SetVals(&resmpl, RSMODE_LINEAR' ''; strictDeps = true; diff --git a/pkgs/applications/audio/vgmplay-libvgm/default.nix b/pkgs/applications/audio/vgmplay-libvgm/default.nix index 199f75ff20273..75701682e1283 100644 --- a/pkgs/applications/audio/vgmplay-libvgm/default.nix +++ b/pkgs/applications/audio/vgmplay-libvgm/default.nix @@ -9,15 +9,15 @@ , inih }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vgmplay-libvgm"; - version = "unstable-2023-04-12"; + version = "unstable-2024-01-03"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "vgmplay-libvgm"; - rev = "813abab549e99bb7e936acbfa1199cf435c237c6"; - sha256 = "sdQO+xk3a7AFXo3jpbcuNBkd19PjKoBMRhr4IK06oHg="; + rev = "7db1c63c056d79a8f9f533aa7eb82b7fdf7d456c"; + hash = "sha256-GjBwu8Y/lOI8SLO4SrAWcntQIwKe/hXuh9tKbOPHQiA="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index 31508b01fbd0a..0d7c098255f24 100644 --- a/pkgs/development/libraries/libvgm/default.nix +++ b/pkgs/development/libraries/libvgm/default.nix @@ -40,15 +40,15 @@ let inherit (lib) optional optionals; onOff = val: if val then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libvgm"; - version = "unstable-2023-08-14"; + version = "unstable-2024-01-03"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "079c4e737e6a73b38ae20125521d7d9eafda28e9"; - sha256 = "hmaGIf9AQOYqrpnmKAB9I2vO+EXrzvoRaQ6Epdygy4o="; + rev = "223b6f9d629feda1982dc4bbeebd19fa63b987fb"; + hash = "sha256-CrqgDuOsY+Hpp41De6oWJduj8d8ftMUanMEWJKh79rw="; }; outputs = [ |