diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix index 23da12cc8057..e6c1fe2ccb2d 100644 --- a/pkgs/by-name/sd/sdl2-compat/package.nix +++ b/pkgs/by-name/sd/sdl2-compat/package.nix @@ -16,7 +16,6 @@ testers, libX11, libGL, - testSupport ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -60,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { # skip timing-based tests as those are flaky env.SDL_TESTS_QUICK = 1; - doCheck = testSupport && stdenv.buildPlatform.canExecute stdenv.hostPlatform; + doCheck = true; patches = [ ./find-headers.patch ]; setupHook = ./setup-hook.sh; @@ -73,20 +72,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 { @@ -108,6 +107,9 @@ stdenv.mkDerivation (finalAttrs: { marcin-serwin ]; platforms = lib.platforms.all; - pkgConfigModules = [ "sdl2-compat" ]; + pkgConfigModules = [ + "sdl2-compat" + "sdl2" + ]; }; })