Merge pull request #2401 from tgstation/FixCurl

Fix curl support on nix

build/Version.props

@@ -3,7 +3,7 @@
   <!-- Integration tests will ensure they match across the board -->
   <Import Project="WebpanelVersion.props" />
   <PropertyGroup>
-    <TgsCoreVersion>6.18.1</TgsCoreVersion>
+    <TgsCoreVersion>6.18.2</TgsCoreVersion>
     <TgsConfigVersion>5.8.0</TgsConfigVersion>
     <TgsRestVersion>10.13.0</TgsRestVersion>
     <TgsGraphQLVersion>0.6.0</TgsGraphQLVersion>

build/package/nix/package.nix

@@ -86,7 +86,6 @@ stdenv.mkDerivation {
     gcc_multi
     glibc
     bash
-    curl
   ];
   nativeBuildInputs = with pkgs; [
     makeWrapper

build/package/nix/tgstation-server.nix

@@ -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" ''