diff --git a/Dist/wrapper-scripts.nix b/Dist/wrapper-scripts.nix index c6f3320f2d..69e9727fc5 100644 --- a/Dist/wrapper-scripts.nix +++ b/Dist/wrapper-scripts.nix @@ -9,6 +9,7 @@ , mesa , mono , openal +, zstd # other parameters , debugPInvokes , hawkVersion @@ -76,7 +77,7 @@ in rec { fi cd "$BIZHAWK_DATA_HOME" - export LD_LIBRARY_PATH="$BIZHAWK_HOME/dll:$BIZHAWK_GLHACKDIR:${lib.makeLibraryPath [ openal ]}" + export LD_LIBRARY_PATH="$BIZHAWK_HOME/dll:$BIZHAWK_GLHACKDIR:${lib.makeLibraryPath [ openal zstd ]}" ${commentUnless debugPInvokes}export MONO_LOG_LEVEL=debug MONO_LOG_MASK=dll if [ "$1" = "--mono-no-redirect" ]; then shift diff --git a/default.nix b/default.nix index c9a4d91a81..f0160e95e4 100644 --- a/default.nix +++ b/default.nix @@ -26,6 +26,7 @@ , mono ? null , openal ? pkgs.openal , uname ? stdenv +, zstd ? pkgs.zstd # other parameters , buildConfig ? "Release" # "Debug"/"Release" , debugPInvokes ? false # forwarded to Dist/wrapper-scripts.nix @@ -48,7 +49,8 @@ let src = hawkSourceInfo.drv; outputs = [ "bin" "out" ]; dotnet-sdk = if hawkSourceInfo ? dotnet-sdk then hawkSourceInfo.dotnet-sdk else dotnet-sdk_6; - buildInputs = [ mesa monoFinal openal uname ];# ++ lib.optionals (forNixOS) [ gtk2-x11 ]; + nativeBuildInputs = [ zstd ]; + buildInputs = [ mesa monoFinal openal uname zstd ];# ++ lib.optionals (forNixOS) [ gtk2-x11 ]; projectFile = "BizHawk.sln"; nugetDeps = if hawkSourceInfo ? nugetDeps then hawkSourceInfo.nugetDeps else Dist/deps.nix; extraDotnetBuildFlags = "-maxcpucount:$NIX_BUILD_CORES -p:BuildInParallel=true --no-restore"; @@ -75,6 +77,7 @@ let checkPhase = '' export GITLAB_CI=1 # pretend to be in GitLab CI -- platform-specific tests don't run in CI because they assume an Arch filesystem (on Linux hosts) # from 2.7.1, use standard -p:ContinuousIntegrationBuild=true instead + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${lib.makeLibraryPath [ zstd ]}" Dist/BuildTest${buildConfig}.sh ${extraDotnetBuildFlags} # can't build w/ extra Analyzers, it fails to restore :( @@ -93,7 +96,7 @@ let }; wrapperScriptsFor = { hawkSourceInfo, bizhawkAssemblies }: import Dist/wrapper-scripts.nix { inherit (pkgs) lib writeShellScriptBin writeText; - inherit commentUnless versionAtLeast mesa openal debugPInvokes initConfig; + inherit commentUnless versionAtLeast mesa openal zstd debugPInvokes initConfig; bizhawk = bizhawkAssemblies; hawkVersion = hawkSourceInfo.version; mono = monoFinal;