Skip to content

Commit 4c9ea5f

Browse files
committed
libretro: fix default meta and passthru
They're being overwritten by whatever was called in mkLibretroCore instead of merging the result.
1 parent d4a9029 commit 4c9ea5f

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

pkgs/applications/emulators/libretro/mkLibretroCore.nix

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ let
3333
"zlib"
3434

3535
"core"
36-
"makefile"
3736
"extraBuildInputs"
3837
"extraNativeBuildInputs"
3938
"libretroCore"
39+
"makefile"
4040
"normalizeCore"
41+
"passthru"
42+
"meta"
4143
];
4244
in
4345
stdenv.mkDerivation (
@@ -88,15 +90,12 @@ stdenv.mkDerivation (
8890
updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
8991
} // (args.passthru or { });
9092

91-
meta =
92-
with lib;
93-
{
94-
inherit mainProgram;
95-
inherit (retroarch-bare.meta) platforms;
96-
homepage = "https://www.libretro.com/";
97-
maintainers = with maintainers; teams.libretro.members;
98-
}
99-
// (args.meta or { });
93+
meta = {
94+
inherit mainProgram;
95+
inherit (retroarch-bare.meta) platforms;
96+
homepage = "https://www.libretro.com/";
97+
maintainers = with lib.maintainers; [ ] ++ lib.teams.libretro.members;
98+
} // (args.meta or { });
10099
}
101100
// extraArgs
102101
)

0 commit comments

Comments
 (0)