From 8f28cad145b25dd78bae0f6831dc808a2decd0d0 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 24 Dec 2025 10:53:59 -0500 Subject: [PATCH 1/9] Fix curl support --- build/package/nix/package.nix | 1 - build/package/nix/tgstation-server.nix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package/nix/package.nix b/build/package/nix/package.nix index 9deeba9fb8..848ebe91f8 100644 --- a/build/package/nix/package.nix +++ b/build/package/nix/package.nix @@ -86,7 +86,6 @@ stdenv.mkDerivation { gcc_multi glibc bash - curl ]; nativeBuildInputs = with pkgs; [ makeWrapper diff --git a/build/package/nix/tgstation-server.nix b/build/package/nix/tgstation-server.nix index 326d6182a1..3e184f0155 100644 --- a/build/package/nix/tgstation-server.nix +++ b/build/package/nix/tgstation-server.nix @@ -19,6 +19,7 @@ let rpath = pkgs-i686.lib.makeLibraryPath [ stdenv.cc.cc.lib + pkgs-i686.curl ]; byond-patcher = pkgs-i686.writeShellScriptBin "EngineInstallComplete-050-TgsPatchELFByond.sh" '' From 8f60ab5a576dd404f9a2c1f74c305dd4caf501f0 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 24 Dec 2025 13:49:49 -0500 Subject: [PATCH 2/9] Try this --- build/package/nix/tgstation-server.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/package/nix/tgstation-server.nix b/build/package/nix/tgstation-server.nix index 3e184f0155..dddbd4a906 100644 --- a/build/package/nix/tgstation-server.nix +++ b/build/package/nix/tgstation-server.nix @@ -15,11 +15,11 @@ let package = import ./package.nix inputs; - stdenv = pkgs-i686.stdenv_32bit; + stdenv32 = pkgs-i686.stdenv_32bit; rpath = pkgs-i686.lib.makeLibraryPath [ - stdenv.cc.cc.lib - pkgs-i686.curl + stdenv32.cc.cc.lib + pkgs-i686.curl.override { stdenv = stdenv32; } ]; byond-patcher = pkgs-i686.writeShellScriptBin "EngineInstallComplete-050-TgsPatchELFByond.sh" '' @@ -32,7 +32,7 @@ let BYOND_PATH=$(realpath $BYOND_BIN_PATH) - ${pkgs.patchelf}/bin/patchelf --set-interpreter "$(cat ${stdenv.cc}/nix-support/dynamic-linker)" \ + ${pkgs.patchelf}/bin/patchelf --set-interpreter "$(cat ${stdenv32.cc}/nix-support/dynamic-linker)" \ --set-rpath "$BYOND_PATH:${rpath}" \ $BYOND_PATH/{DreamDaemon,DreamDownload,DreamMaker} ''; From 302b73c5cc19884c0451e03fcbc1551d27007b3e Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 24 Dec 2025 14:28:22 -0500 Subject: [PATCH 3/9] Fix build --- build/package/nix/tgstation-server.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/package/nix/tgstation-server.nix b/build/package/nix/tgstation-server.nix index dddbd4a906..26874cccb0 100644 --- a/build/package/nix/tgstation-server.nix +++ b/build/package/nix/tgstation-server.nix @@ -17,9 +17,11 @@ let stdenv32 = pkgs-i686.stdenv_32bit; + curl32 = pkgs-i686.curl.lib.override { stdenv = stdenv32; }; + rpath = pkgs-i686.lib.makeLibraryPath [ stdenv32.cc.cc.lib - pkgs-i686.curl.override { stdenv = stdenv32; } + curl32 ]; byond-patcher = pkgs-i686.writeShellScriptBin "EngineInstallComplete-050-TgsPatchELFByond.sh" '' From 3fddfc2b0fbd8c8e03fc4fa3fdde21e2164e4e1c Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 24 Dec 2025 14:33:44 -0500 Subject: [PATCH 4/9] Oops --- build/package/nix/tgstation-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package/nix/tgstation-server.nix b/build/package/nix/tgstation-server.nix index 26874cccb0..ffae93a8aa 100644 --- a/build/package/nix/tgstation-server.nix +++ b/build/package/nix/tgstation-server.nix @@ -17,7 +17,7 @@ let stdenv32 = pkgs-i686.stdenv_32bit; - curl32 = pkgs-i686.curl.lib.override { stdenv = stdenv32; }; + curl32 = pkgs-i686.curl.override { stdenv = stdenv32; }; rpath = pkgs-i686.lib.makeLibraryPath [ stdenv32.cc.cc.lib From 16abfacbaceac48fdf32e6b6f19edbf91aadf779 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 24 Dec 2025 15:20:43 -0500 Subject: [PATCH 5/9] 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" '' From 1b7636e3a9474841124b031338d9311c195a4344 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 24 Dec 2025 15:28:24 -0500 Subject: [PATCH 6/9] Temporary version revision --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 0ade4b9f55..80026e5567 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ - 6.18.1 + 6.18.0 5.8.0 10.13.0 0.6.0 From 248c643883efdc04bfac58c4bd3458e88bc901b6 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 24 Dec 2025 15:33:26 -0500 Subject: [PATCH 7/9] FUCK --- build/package/nix/tgstation-server.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/package/nix/tgstation-server.nix b/build/package/nix/tgstation-server.nix index 46193cd1e4..2b6652d949 100644 --- a/build/package/nix/tgstation-server.nix +++ b/build/package/nix/tgstation-server.nix @@ -24,7 +24,9 @@ let libbyond-rpath = pkgs-i686.lib.makeLibraryPath [ pkgs-i686.curl ]; - +Script /nix/store/f850qwvpi4g0ldszhw2d5c4szf0wcgl6-EngineInstallComplete-050-TgsPatchELFByond.sh/bin/EngineInstallComplete-050-TgsPatchELFByond.sh exited with code 1: +patchelf: missing filename + (Inner exception: ) byond-patcher = pkgs-i686.writeShellScriptBin "EngineInstallComplete-050-TgsPatchELFByond.sh" '' # If the file doesn't exist, assume OD BYOND_BIN_PATH="''${TGS_INSTANCE_ROOT}/Byond/$1/byond/bin/" @@ -39,7 +41,7 @@ let --set-rpath "$BYOND_PATH:${exes-rpath}" \ $BYOND_PATH/{DreamDaemon,DreamDownload,DreamMaker} - ${pkgs.patchelf}/bin/patchelf --set-rpath "${libbyond-rpath}" + ${pkgs.patchelf}/bin/patchelf --set-rpath "${libbyond-rpath}" $BYOND_PATH/libbyond.so ''; tgs-wrapper = pkgs.writeShellScriptBin "tgs-path-wrapper" '' From 4204cc13a035545aa61c8116976b5e4a5c68c1a5 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 24 Dec 2025 15:42:45 -0500 Subject: [PATCH 8/9] Gdi --- build/package/nix/tgstation-server.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build/package/nix/tgstation-server.nix b/build/package/nix/tgstation-server.nix index 2b6652d949..3d08c4263c 100644 --- a/build/package/nix/tgstation-server.nix +++ b/build/package/nix/tgstation-server.nix @@ -24,9 +24,7 @@ let libbyond-rpath = pkgs-i686.lib.makeLibraryPath [ pkgs-i686.curl ]; -Script /nix/store/f850qwvpi4g0ldszhw2d5c4szf0wcgl6-EngineInstallComplete-050-TgsPatchELFByond.sh/bin/EngineInstallComplete-050-TgsPatchELFByond.sh exited with code 1: -patchelf: missing filename - (Inner exception: ) + byond-patcher = pkgs-i686.writeShellScriptBin "EngineInstallComplete-050-TgsPatchELFByond.sh" '' # If the file doesn't exist, assume OD BYOND_BIN_PATH="''${TGS_INSTANCE_ROOT}/Byond/$1/byond/bin/" From 2ed571ef70672adf324415f12c3adb673324a53b Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 24 Dec 2025 15:57:09 -0500 Subject: [PATCH 9/9] Version bump --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 80026e5567..80ba2e95de 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ - 6.18.0 + 6.18.2 5.8.0 10.13.0 0.6.0