From 6f20da9b704075cc974577bd78bc270ba7114a4a Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 31 Oct 2025 09:36:32 -0500 Subject: [PATCH] mame: migrate to by-name --- .../ma}/mame/001-use-absolute-paths.diff | 0 .../mame/default.nix => by-name/ma/mame/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/{applications/emulators => by-name/ma}/mame/001-use-absolute-paths.diff (100%) rename pkgs/{applications/emulators/mame/default.nix => by-name/ma/mame/package.nix} (99%) diff --git a/pkgs/applications/emulators/mame/001-use-absolute-paths.diff b/pkgs/by-name/ma/mame/001-use-absolute-paths.diff similarity index 100% rename from pkgs/applications/emulators/mame/001-use-absolute-paths.diff rename to pkgs/by-name/ma/mame/001-use-absolute-paths.diff diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/by-name/ma/mame/package.nix similarity index 99% rename from pkgs/applications/emulators/mame/default.nix rename to pkgs/by-name/ma/mame/package.nix index 9db7a75cc8f6..9aff002a0f9f 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/by-name/ma/mame/package.nix @@ -24,13 +24,12 @@ portmidi, pugixml, python3, - qtbase, + libsForQt5, rapidjson, sqlite, utf8proc, versionCheckHook, which, - wrapQtAppsHook, writeScript, zlib, }: @@ -88,7 +87,7 @@ stdenv.mkDerivation rec { SDL2 SDL2_ttf sqlite - qtbase + libsForQt5.qtbase ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib @@ -108,7 +107,7 @@ stdenv.mkDerivation rec { pkg-config python3 which - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e48ec77acdb..00b642e88507 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1215,8 +1215,6 @@ with pkgs; libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; - mame = libsForQt5.callPackage ../applications/emulators/mame { }; - mame-tools = lib.addMetaAttrs { description = mame.meta.description + " (tools only)"; } (lib.getOutput "tools" mame);