From acd3e908a016233657989d5e7ca4353618ccd664 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 --- pkgs/by-name/dd/ddnet/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix index 4753f06e7894..f3617d3bb790 100644 --- a/pkgs/by-name/dd/ddnet/package.nix +++ b/pkgs/by-name/dd/ddnet/package.nix @@ -111,7 +111,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 894f30ecbfbb4738ab67a3726368cbf2d7630084 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 --- pkgs/by-name/dd/ddnet/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix index f3617d3bb790..9f4ad6d0c392 100644 --- a/pkgs/by-name/dd/ddnet/package.nix +++ b/pkgs/by-name/dd/ddnet/package.nix @@ -137,6 +137,6 @@ stdenv.mkDerivation rec { Scrumplex sirseruju ]; - mainProgram = "DDNet"; + mainProgram = "DDNet${lib.optionalString (!buildClient) "-Server"}"; }; }