From 8196d39d7ab091d6cdb24aa63c7ff7f752da5a27 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 26 Apr 2024 20:11:05 -0300 Subject: [PATCH 1/3] mgba: remove MP2E from maintainers --- pkgs/applications/emulators/mgba/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix index 457d5c7e4fcd..3cbdee7cdaa0 100644 --- a/pkgs/applications/emulators/mgba/default.nix +++ b/pkgs/applications/emulators/mgba/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://raw.githubusercontent.com/mgba-emu/mgba/${finalAttrs.src.rev}/CHANGES"; license = with lib.licenses; [ mpl20 ]; mainProgram = "mgba"; - maintainers = with lib.maintainers; [ MP2E AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; broken = enableDiscordRpc; # Some obscure `ld` error }; From 407cc93a73cb951589c2032714d329f53a84217d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 26 Apr 2024 20:16:24 -0300 Subject: [PATCH 2/3] mgba: reword input set --- pkgs/applications/emulators/mgba/default.nix | 35 ++++++++++---------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix index 3cbdee7cdaa0..8f23998f01e0 100644 --- a/pkgs/applications/emulators/mgba/default.nix +++ b/pkgs/applications/emulators/mgba/default.nix @@ -1,20 +1,21 @@ -{ lib -, SDL2 -, cmake -, fetchFromGitHub -, ffmpeg -, discord-rpc -, libedit -, elfutils -, libepoxy -, libsForQt5 -, libzip -, lua -, minizip -, pkg-config -, stdenv -, wrapGAppsHook -, enableDiscordRpc ? false +{ + lib, + SDL2, + cmake, + fetchFromGitHub, + ffmpeg, + discord-rpc, + libedit, + elfutils, + libepoxy, + libsForQt5, + libzip, + lua, + minizip, + pkg-config, + stdenv, + wrapGAppsHook, + enableDiscordRpc ? false, }: let From 82ffbc8b2d66369afbb729c6d47a7a63ee23f685 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 26 Apr 2024 20:18:02 -0300 Subject: [PATCH 3/3] mgba: migrate to by-name --- .../emulators/mgba/default.nix => by-name/mg/mgba/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/emulators/mgba/default.nix => by-name/mg/mgba/package.nix} (100%) diff --git a/pkgs/applications/emulators/mgba/default.nix b/pkgs/by-name/mg/mgba/package.nix similarity index 100% rename from pkgs/applications/emulators/mgba/default.nix rename to pkgs/by-name/mg/mgba/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bc821761088..e0986e7578b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2736,8 +2736,6 @@ with pkgs; description = mame.meta.description + " (tools only)"; } (lib.getOutput "tools" mame); - mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; - mupen64plus = callPackage ../applications/emulators/mupen64plus { }; np2kai = callPackage ../applications/emulators/np2kai { };