From 17102da83ef43267d3bf1185a2dea3ae7745e009 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 3 Aug 2025 14:24:40 -0400 Subject: [PATCH] Maybe like this? --- build/package/nix/package.nix | 12 +++++------- build/package/nix/tgstation-server.nix | 2 -- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/build/package/nix/package.nix b/build/package/nix/package.nix index f68e7fba6f..c86aa2c845 100644 --- a/build/package/nix/package.nix +++ b/build/package/nix/package.nix @@ -1,7 +1,5 @@ { pkgs, - buildDotnetModule, - dotnetCorePackages, ... }: @@ -35,7 +33,7 @@ let rpath = lib.makeLibraryPath [ pkgs.stdenv_32bit.cc.cc.lib ]; - tgstation-server-host-console = buildDotnetModule { + tgstation-server-host-console = pkgs.buildDotnetModule { pname = "Tgstation.Server.Host.Console"; version = (builtins.readFile "${versionParse}/tgs_version.txt"); @@ -48,8 +46,8 @@ let executables = []; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnet-sdk = pkgs.dotnetCorePackages.sdk_8_0; + dotnet-runtime = pkgs.dotnetCorePackages.runtime_8_0; }; in stdenv.mkDerivation { @@ -65,7 +63,7 @@ stdenv.mkDerivation { }; buildInputs = with pkgs; [ - dotnetCorePackages.sdk_8_0 + pkgs.dotnetCorePackages.sdk_8_0 gdb systemd zlib @@ -88,7 +86,7 @@ stdenv.mkDerivation { lib.makeBinPath ( with pkgs; [ - dotnetCorePackages.sdk_8_0 + pkgs.dotnetCorePackages.sdk_8_0 gdb bash ] diff --git a/build/package/nix/tgstation-server.nix b/build/package/nix/tgstation-server.nix index 2a02828eed..326d6182a1 100644 --- a/build/package/nix/tgstation-server.nix +++ b/build/package/nix/tgstation-server.nix @@ -5,8 +5,6 @@ inputs@{ nixpkgs, pkgs, writeShellScriptBin, - buildDotnetModule, - dotnetCorePackages, ... }: