From adeef1ee8234ebb828d8dc0b427866a33fd648a5 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Mon, 28 Apr 2025 18:00:11 +0200 Subject: [PATCH] sdl2-compat: simplify tests SDL2 now points to this package, no need to override it manually. --- pkgs/by-name/sd/sdl2-compat/package.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix index 23da12cc8057..e7fec71ac32a 100644 --- a/pkgs/by-name/sd/sdl2-compat/package.nix +++ b/pkgs/by-name/sd/sdl2-compat/package.nix @@ -73,20 +73,20 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests = - let - replaceSDL2 = drv: drv.override { SDL2 = finalAttrs.finalPackage; }; - in { - pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; - SDL2_ttf = replaceSDL2 SDL2_ttf; - SDL2_net = replaceSDL2 SDL2_net; - SDL2_gfx = replaceSDL2 SDL2_gfx; - SDL2_sound = replaceSDL2 SDL2_sound; - SDL2_mixer = replaceSDL2 SDL2_mixer; - SDL2_image = replaceSDL2 SDL2_image; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + inherit + SDL2_ttf + SDL2_net + SDL2_gfx + SDL2_sound + SDL2_mixer + SDL2_image + ; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { - monado = replaceSDL2 monado; + inherit monado; }; updateScript = nix-update-script {