ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Nix expr: Add libzstd to rundeps

This commit is contained in:
YoshiRulz 2022-08-17 20:28:58 +10:00
parent 8d484ac196
commit f973ef91dd
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dist/wrapper-scripts.nix
View File

@ -9,6 +9,7 @@
, mesa , mesa
, mono , mono
, openal , openal
, zstd
# other parameters # other parameters
, debugPInvokes , debugPInvokes
, hawkVersion , hawkVersion
@ -76,7 +77,7 @@ in rec {
fi fi
cd "$BIZHAWK_DATA_HOME" 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 ${commentUnless debugPInvokes}export MONO_LOG_LEVEL=debug MONO_LOG_MASK=dll
if [ "$1" = "--mono-no-redirect" ]; then if [ "$1" = "--mono-no-redirect" ]; then
shift shift

7
default.nix
View File

@ -26,6 +26,7 @@
, mono ? null , mono ? null
, openal ? pkgs.openal , openal ? pkgs.openal
, uname ? stdenv , uname ? stdenv
, zstd ? pkgs.zstd
# other parameters # other parameters
, buildConfig ? "Release" # "Debug"/"Release" , buildConfig ? "Release" # "Debug"/"Release"
, debugPInvokes ? false # forwarded to Dist/wrapper-scripts.nix , debugPInvokes ? false # forwarded to Dist/wrapper-scripts.nix
@ -48,7 +49,8 @@ let
src = hawkSourceInfo.drv; src = hawkSourceInfo.drv;
outputs = [ "bin" "out" ]; outputs = [ "bin" "out" ];
dotnet-sdk = if hawkSourceInfo ? dotnet-sdk then hawkSourceInfo.dotnet-sdk else dotnet-sdk_6; 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"; projectFile = "BizHawk.sln";
nugetDeps = if hawkSourceInfo ? nugetDeps then hawkSourceInfo.nugetDeps else Dist/deps.nix; nugetDeps = if hawkSourceInfo ? nugetDeps then hawkSourceInfo.nugetDeps else Dist/deps.nix;
extraDotnetBuildFlags = "-maxcpucount:$NIX_BUILD_CORES -p:BuildInParallel=true --no-restore"; extraDotnetBuildFlags = "-maxcpucount:$NIX_BUILD_CORES -p:BuildInParallel=true --no-restore";
@ -75,6 +77,7 @@ let
checkPhase = '' 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) 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 # 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} Dist/BuildTest${buildConfig}.sh ${extraDotnetBuildFlags}
# can't build w/ extra Analyzers, it fails to restore :( # can't build w/ extra Analyzers, it fails to restore :(
@ -93,7 +96,7 @@ let
}; };
wrapperScriptsFor = { hawkSourceInfo, bizhawkAssemblies }: import Dist/wrapper-scripts.nix { wrapperScriptsFor = { hawkSourceInfo, bizhawkAssemblies }: import Dist/wrapper-scripts.nix {
inherit (pkgs) lib writeShellScriptBin writeText; inherit (pkgs) lib writeShellScriptBin writeText;
inherit commentUnless versionAtLeast mesa openal debugPInvokes initConfig; inherit commentUnless versionAtLeast mesa openal zstd debugPInvokes initConfig;
bizhawk = bizhawkAssemblies; bizhawk = bizhawkAssemblies;
hawkVersion = hawkSourceInfo.version; hawkVersion = hawkSourceInfo.version;
mono = monoFinal; mono = monoFinal;