From 2970860c61fce31b5d0b6044170c02ec12de21e8 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Mon, 2 Jun 2025 10:26:27 +0200 Subject: [PATCH] sdl2-compat: Add more relevant passthru tests `monado` was added in #380523 to show `sdl2-compat` could be used to build SDL2 programs when `sdl2-compat` was first added. It is not particularly load-bearing, and because it depends on OpenCV it is quite expensive to build from source in a world-rebuild. I propose instead testing `SDL_compat`, `ffmpeg` and `qemu`. These packages are much more important for nixpkgs as a whole, either testing SDL, being required for most gui apps, or building VM tests. `qemu` on darwin does not enable sdl support, so that check is linux-only. --- pkgs/by-name/sd/sdl2-compat/package.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix index ee975d422139..03f76b78e462 100644 --- a/pkgs/by-name/sd/sdl2-compat/package.nix +++ b/pkgs/by-name/sd/sdl2-compat/package.nix @@ -2,20 +2,24 @@ cmake, lib, fetchFromGitHub, - monado, ninja, + sdl3, + stdenv, + testers, + libX11, + libGL, nix-update-script, + + # passthru tests SDL2_ttf, SDL2_net, SDL2_gfx, SDL2_sound, SDL2_mixer, SDL2_image, - sdl3, - stdenv, - testers, - libX11, - libGL, + SDL_compat, + ffmpeg, + qemu, }: stdenv.mkDerivation (finalAttrs: { @@ -76,16 +80,18 @@ stdenv.mkDerivation (finalAttrs: { pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; inherit + SDL_compat SDL2_ttf SDL2_net SDL2_gfx SDL2_sound SDL2_mixer SDL2_image + ffmpeg ; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { - inherit monado; + inherit qemu; }; updateScript = nix-update-script {