cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-25 22:17:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Jordan Dominion
2025-12-29 16:24:23 -05:00
parent 72c3850eb3 a10248be75
commit 4cde6c09a0
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/package/nix/package.nix
-1
View File
@@ -68,7 +68,6 @@ stdenv.mkDerivation {
gcc_multi
glibc
bash
curl
tgstation-server-host-console
];
nativeBuildInputs = with pkgs; [
build/package/nix/tgstation-server.nix
+11 -5
View File
@@ -15,10 +15,14 @@ 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
exes-rpath = pkgs-i686.lib.makeLibraryPath [
stdenv32.cc.cc.lib
];
libbyond-rpath = pkgs-i686.lib.makeLibraryPath [
pkgs-i686.curl
];
byond-patcher = pkgs-i686.writeShellScriptBin "EngineInstallComplete-050-TgsPatchELFByond.sh" ''
@@ -31,9 +35,11 @@ let
BYOND_PATH=$(realpath $BYOND_BIN_PATH)
${pkgs.patchelf}/bin/patchelf --set-interpreter "$(cat ${stdenv.cc}/nix-support/dynamic-linker)" \
--set-rpath "$BYOND_PATH:${rpath}" \
${pkgs.patchelf}/bin/patchelf --set-interpreter "$(cat ${stdenv32.cc}/nix-support/dynamic-linker)" \
--set-rpath "$BYOND_PATH:${exes-rpath}" \
$BYOND_PATH/{DreamDaemon,DreamDownload,DreamMaker}
${pkgs.patchelf}/bin/patchelf --set-rpath "${libbyond-rpath}" $BYOND_PATH/libbyond.so
'';
tgs-wrapper = pkgs.writeShellScriptBin "tgs-path-wrapper" ''