From cde5248a1efb30f2f27c21974656776dbc8e7216 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 18 Mar 2025 09:10:04 +0100 Subject: [PATCH] armagetronad: fix build commit 7aeac03f40021f4b213d460ef5813e52184368db (PR 386495) dropped libX11 and libGLU from propagatedBuildInputs in SDL, which broke this build --- pkgs/games/armagetronad/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index 5bab46e5b7c3..51cf2829be7f 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -19,7 +19,10 @@ SDL2, SDL2_image, SDL2_mixer, + libGL, + libGLU, libpng, + libX11, libxml2, protobuf, xvfb-run, @@ -54,6 +57,9 @@ let inherit version; src = fetchArmagetron rev hash; extraBuildInputs = lib.optionals (!dedicatedServer) [ + libGL + libGLU + libX11 libpng SDL SDL_image @@ -79,6 +85,9 @@ let glew ftgl freetype + libGL + libGLU + libX11 SDL2 SDL2_image SDL2_mixer @@ -96,6 +105,9 @@ let version = "${latestVersionMajor}-sty+ct+ap-${builtins.substring 0 8 rev}"; src = fetchArmagetron rev hash; extraBuildInputs = lib.optionals (!dedicatedServer) [ + libGL + libGLU + libX11 libpng SDL SDL_image