From f516853cf76530726d64556c6041212eedac996c Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 1 Nov 2025 22:14:53 +0100 Subject: [PATCH 1/2] sdl-jstest: disable SDL1 build Signed-off-by: Marcin Serwin --- pkgs/by-name/sd/sdl-jstest/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/sdl-jstest/package.nix b/pkgs/by-name/sd/sdl-jstest/package.nix index 57e47ca9ef61..b1cb7a1c09d0 100644 --- a/pkgs/by-name/sd/sdl-jstest/package.nix +++ b/pkgs/by-name/sd/sdl-jstest/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, pkg-config, - SDL, SDL2, ncurses, docbook_xsl, @@ -24,10 +23,10 @@ stdenv.mkDerivation { }; buildInputs = [ - SDL SDL2 ncurses ]; + nativeBuildInputs = [ cmake pkg-config @@ -35,11 +34,14 @@ stdenv.mkDerivation { git ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_SDL_JSTEST" false) ]; + meta = with lib; { homepage = "https://github.com/Grumbel/sdl-jstest"; description = "Simple SDL joystick test application for the console"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ ]; + mainProgram = "sdl2-jstest"; }; } From 788250ba78d1bc35c839c7ba26c1523dec860b08 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 1 Nov 2025 22:17:33 +0100 Subject: [PATCH 2/2] sdl-jstest: modernize Signed-off-by: Marcin Serwin --- pkgs/by-name/sd/sdl-jstest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sd/sdl-jstest/package.nix b/pkgs/by-name/sd/sdl-jstest/package.nix index b1cb7a1c09d0..cd9afdb4cdb1 100644 --- a/pkgs/by-name/sd/sdl-jstest/package.nix +++ b/pkgs/by-name/sd/sdl-jstest/package.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation { cmakeFlags = [ (lib.cmakeBool "BUILD_SDL_JSTEST" false) ]; - meta = with lib; { + meta = { homepage = "https://github.com/Grumbel/sdl-jstest"; description = "Simple SDL joystick test application for the console"; - license = licenses.gpl3; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; maintainers = [ ]; mainProgram = "sdl2-jstest"; };