From fd7733431852e867f6c69909d79a8786497ffaf9 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 19 Mar 2025 21:07:06 +0100 Subject: [PATCH 1/2] ddnet-server: fix Darwin build The server variant of the ddnet package does not ship the client, so we don't need to patch in libsteam_api.dylib Signed-off-by: Sefa Eyeoglu (cherry picked from commit acd3e908a016233657989d5e7ca4353618ccd664) --- pkgs/games/ddnet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 7ab1ef89e2e7..f55f18b2d895 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { rm -rf $out/share/metainfo ''; - preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + preFixup = lib.optionalString (stdenv.hostPlatform.isDarwin && buildClient) '' # Upstream links against /lib while it installs this library in /lib/ddnet install_name_tool -change "$out/lib/libsteam_api.dylib" "$out/lib/ddnet/libsteam_api.dylib" "$out/bin/DDNet" ''; From bc0ada7b00259da3b75d18839df876ca2ec88973 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 19 Mar 2025 21:08:57 +0100 Subject: [PATCH 2/2] ddnet-server: set correct mainProgram Signed-off-by: Sefa Eyeoglu (cherry picked from commit 894f30ecbfbb4738ab67a3726368cbf2d7630084) --- pkgs/games/ddnet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index f55f18b2d895..1443deea9162 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -136,6 +136,6 @@ stdenv.mkDerivation rec { lom ncfavier ]; - mainProgram = "DDNet"; + mainProgram = "DDNet${lib.optionalString (!buildClient) "-Server"}"; }; }