From 3e5b16c2cf3d2d105f28f7efe143445808053d3d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 20 Apr 2025 09:46:11 +0100 Subject: [PATCH 1/2] SDL2_gfx: fix underlinking against `-lm` Without the change `freeciv_sdl2` fails to detec `-lSDL2_gfx` as https://hydra.nixos.org/build/294735307: checking for rotozoomSurface in -lSDL2_gfx... no configure: error: specified client 'sdl2' not configurable (SDL2_gfx is needed (www.libsdl.org)) --- pkgs/by-name/sd/SDL2_gfx/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/sd/SDL2_gfx/package.nix b/pkgs/by-name/sd/SDL2_gfx/package.nix index 4d6f6d77bbd7..5ae903baf1c2 100644 --- a/pkgs/by-name/sd/SDL2_gfx/package.nix +++ b/pkgs/by-name/sd/SDL2_gfx/package.nix @@ -38,6 +38,10 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; + # Missing 'sincos()' implementation fails linking projects + # like 'freeciv_sdl2'. + env.NIX_LDFLAGS = "-lm"; + configureFlags = [ (lib.enableFeature enableMmx "mmx") (lib.enableFeature enableSdltest "sdltest") From 136eb348f88aeacc2e47fd3bcfdebd36a6c76609 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 20 Apr 2025 09:50:45 +0100 Subject: [PATCH 2/2] SDL2_gfx: enable parallel building --- pkgs/by-name/sd/SDL2_gfx/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/sd/SDL2_gfx/package.nix b/pkgs/by-name/sd/SDL2_gfx/package.nix index 5ae903baf1c2..2e88d0f17ed0 100644 --- a/pkgs/by-name/sd/SDL2_gfx/package.nix +++ b/pkgs/by-name/sd/SDL2_gfx/package.nix @@ -49,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + enableParallelBuilding = true; + passthru = { tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage;