From 16abfacbaceac48fdf32e6b6f19edbf91aadf779 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Wed, 24 Dec 2025 15:20:43 -0500
Subject: [PATCH] Fix libbyond rpath

---
 build/package/nix/tgstation-server.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/build/package/nix/tgstation-server.nix b/build/package/nix/tgstation-server.nix
index ffae93a8aa..46193cd1e4 100644
--- a/build/package/nix/tgstation-server.nix
+++ b/build/package/nix/tgstation-server.nix
@@ -17,11 +17,12 @@ let
 
   stdenv32 = pkgs-i686.stdenv_32bit;
 
-  curl32 = pkgs-i686.curl.override { stdenv = stdenv32; };
-
-  rpath = pkgs-i686.lib.makeLibraryPath [
+  exes-rpath = pkgs-i686.lib.makeLibraryPath [
     stdenv32.cc.cc.lib
-    curl32
+  ];
+
+  libbyond-rpath = pkgs-i686.lib.makeLibraryPath [
+    pkgs-i686.curl
   ];
 
   byond-patcher = pkgs-i686.writeShellScriptBin "EngineInstallComplete-050-TgsPatchELFByond.sh" ''
@@ -35,8 +36,10 @@ let
     BYOND_PATH=$(realpath $BYOND_BIN_PATH)
 
     ${pkgs.patchelf}/bin/patchelf --set-interpreter "$(cat ${stdenv32.cc}/nix-support/dynamic-linker)" \
-      --set-rpath "$BYOND_PATH:${rpath}" \
+      --set-rpath "$BYOND_PATH:${exes-rpath}" \
       $BYOND_PATH/{DreamDaemon,DreamDownload,DreamMaker}
+
+    ${pkgs.patchelf}/bin/patchelf --set-rpath "${libbyond-rpath}"
   '';
 
   tgs-wrapper = pkgs.writeShellScriptBin "tgs-path-wrapper" ''