From 6697b05926566fc88ae8365549c5354e7128c07c Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Sat, 18 Oct 2025 06:49:31 -0700 Subject: [PATCH] libmt32emu: modernize, move to by-name/ --- .../li/libmt32emu/package.nix} | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) rename pkgs/{applications/audio/munt/libmt32emu.nix => by-name/li/libmt32emu/package.nix} (63%) diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/by-name/li/libmt32emu/package.nix similarity index 63% rename from pkgs/applications/audio/munt/libmt32emu.nix rename to pkgs/by-name/li/libmt32emu/package.nix index 6d42712f4c8c..e01401581474 100644 --- a/pkgs/applications/audio/munt/libmt32emu.nix +++ b/pkgs/by-name/li/libmt32emu/package.nix @@ -5,15 +5,15 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmt32emu"; version = "2.7.2"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; - rev = "${pname}_${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-wXIvdGoup/AOQggkeXvtbi3pXhyKUKWmyt/ZbGzufds="; + tag = "libmt32emu_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; + hash = "sha256-wXIvdGoup/AOQggkeXvtbi3pXhyKUKWmyt/ZbGzufds="; }; outputs = [ @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { --replace "$dev/$dev/" "$dev/" ''; - meta = with lib; { + meta = { homepage = "https://munt.sourceforge.net/"; description = "Library to emulate Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; - license = with licenses; [ lgpl21Plus ]; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.unix; # Not tested on ReactOS yet :) + license = with lib.licenses; [ lgpl21Plus ]; + maintainers = with lib.maintainers; [ OPNA2608 ]; + platforms = lib.platforms.unix; # Not tested on ReactOS yet :) }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb44eb97812c..8abee87bb687 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11407,8 +11407,6 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { }; - mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { }; mt32emu-smf2wav = callPackage ../applications/audio/munt/mt32emu-smf2wav.nix { };