mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-08-22 20:47:28 +01:00
Fix libbyond rpath
This commit is contained in:
@@ -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" ''
|
||||
|
||||
Reference in New Issue
Block a user