From 4c9ea5f89fb712b76eb3fc14169eabab3aa3c8da Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 27 Mar 2025 22:08:00 +0000 Subject: [PATCH] libretro: fix default meta and passthru They're being overwritten by whatever was called in mkLibretroCore instead of merging the result. --- .../emulators/libretro/mkLibretroCore.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/emulators/libretro/mkLibretroCore.nix b/pkgs/applications/emulators/libretro/mkLibretroCore.nix index da4d73bb121e..35ad4776ef89 100644 --- a/pkgs/applications/emulators/libretro/mkLibretroCore.nix +++ b/pkgs/applications/emulators/libretro/mkLibretroCore.nix @@ -33,11 +33,13 @@ let "zlib" "core" - "makefile" "extraBuildInputs" "extraNativeBuildInputs" "libretroCore" + "makefile" "normalizeCore" + "passthru" + "meta" ]; in stdenv.mkDerivation ( @@ -88,15 +90,12 @@ stdenv.mkDerivation ( updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; } // (args.passthru or { }); - meta = - with lib; - { - inherit mainProgram; - inherit (retroarch-bare.meta) platforms; - homepage = "https://www.libretro.com/"; - maintainers = with maintainers; teams.libretro.members; - } - // (args.meta or { }); + meta = { + inherit mainProgram; + inherit (retroarch-bare.meta) platforms; + homepage = "https://www.libretro.com/"; + maintainers = with lib.maintainers; [ ] ++ lib.teams.libretro.members; + } // (args.meta or { }); } // extraArgs )