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

Nix expr: Set `$GTK_PATH` to mute warning

This commit is contained in:
YoshiRulz 2024-09-22 03:19:25 +10:00
parent 9a2c163461
commit 760a5b5285
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dist/launch-scripts.nix
View File

@ -89,6 +89,7 @@
fixed by adding `${pkgs.gtk2-x11.out}/lib` to `$LD_LIBRARY_PATH` fixed by adding `${pkgs.gtk2-x11.out}/lib` to `$LD_LIBRARY_PATH`
we're now in Adwaita (light) instead of ugly beige! we're now in Adwaita (light) instead of ugly beige!
this does add a new warning to stderr though: `Unable to locate theme engine in module_path: "adwaita"` this does add a new warning to stderr though: `Unable to locate theme engine in module_path: "adwaita"`
fixed by adding `${pkgs.gnome3.gnome-themes-extra}/lib/gtk-2.0` to `$GTK_PATH`
sadly, it still doesn't seem to respect `$GTK_RC_FILES` or even `$GTK_THEME` :( sadly, it still doesn't seem to respect `$GTK_RC_FILES` or even `$GTK_THEME` :(
*/}ldLibPath="$BIZHAWK_INT_SYSLIB_PATH:${lib.makeLibraryPath bizhawkAssemblies.buildInputs}" */}ldLibPath="$BIZHAWK_INT_SYSLIB_PATH:${lib.makeLibraryPath bizhawkAssemblies.buildInputs}"
if [ -z "$LD_LIBRARY_PATH" ]; then if [ -z "$LD_LIBRARY_PATH" ]; then
@ -96,6 +97,11 @@
else else
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ldLibPath" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ldLibPath"
fi fi
if [ -z "$GTK_PATH" ]; then
export GTK_PATH='${bizhawkAssemblies.gnome-themes-extra}/lib/gtk-2.0'
else
export GTK_PATH="${bizhawkAssemblies.gnome-themes-extra}/lib/gtk-2.0:$GTK_PATH"
fi
${if profileManagedCalls == false then "" else ''printf "Will write profiling results to %s/*.mlpd\n" "$PWD" ${if profileManagedCalls == false then "" else ''printf "Will write profiling results to %s/*.mlpd\n" "$PWD"
''}${if bizhawkAssemblies.hawkSourceInfo.hasAssemblyResolveHandler then "" else ''export MONO_PATH="$BIZHAWK_HOME/dll/nlua:$BIZHAWK_HOME/dll" ''}${if bizhawkAssemblies.hawkSourceInfo.hasAssemblyResolveHandler then "" else ''export MONO_PATH="$BIZHAWK_HOME/dll/nlua:$BIZHAWK_HOME/dll"
''}${lib.optionalString (!debugPInvokes) "# "}export MONO_LOG_LEVEL=debug MONO_LOG_MASK=dll # pass `--arg debugPInvokes true` to nix-build to enable ''}${lib.optionalString (!debugPInvokes) "# "}export MONO_LOG_LEVEL=debug MONO_LOG_MASK=dll # pass `--arg debugPInvokes true` to nix-build to enable

5
Dist/packages.nix
View File

@ -16,6 +16,7 @@
# makedeps # makedeps
, git , git
# rundeps # rundeps
, gnome-themes-extra
, gtk2-x11 , gtk2-x11
, libgdiplus , libgdiplus
, libGL , libGL
@ -81,7 +82,7 @@
hawkSourceInfo = populateHawkSourceInfo hawkSourceInfo'; hawkSourceInfo = populateHawkSourceInfo hawkSourceInfo';
extraManagedDeps = hawkSourceInfo.extraManagedDeps or buildExtraManagedDepsFor hawkSourceInfo; extraManagedDeps = hawkSourceInfo.extraManagedDeps or buildExtraManagedDepsFor hawkSourceInfo;
in buildDotnetModule (lib.fix (finalAttrs: { # proper `finalAttrs` not supported >:( in buildDotnetModule (lib.fix (finalAttrs: { # proper `finalAttrs` not supported >:(
inherit doCheck mono; inherit doCheck gnome-themes-extra mono;
inherit (hawkSourceInfo) __contentAddressed dotnet-sdk nugetDeps src version; inherit (hawkSourceInfo) __contentAddressed dotnet-sdk nugetDeps src version;
pname = "BizHawk"; pname = "BizHawk";
isLocalBuild = lib.hasSuffix "-local" finalAttrs.version; isLocalBuild = lib.hasSuffix "-local" finalAttrs.version;
@ -175,7 +176,7 @@
passthru = { passthru = {
inherit extraManagedDeps # could use this to backport changes to ExternalProjects? IDK inherit extraManagedDeps # could use this to backport changes to ExternalProjects? IDK
hawkSourceInfo; # simple way to override `nugetDeps` for patching: `buildAssembliesFor (bizhawkAssemblies-latest.hawkSourceInfo // { nugetDeps = /*...*/; })` hawkSourceInfo; # simple way to override `nugetDeps` for patching: `buildAssembliesFor (bizhawkAssemblies-latest.hawkSourceInfo // { nugetDeps = /*...*/; })`
inherit (finalAttrs) mono; inherit (finalAttrs) gnome-themes-extra mono;
# extraUnmanagedDeps = buildUnmanagedDepsFor hawkSourceInfo; # this will override the output of the same name, example: `buildEmuHawkInstallableFor { bizhawkAssemblies = bizhawkAssemblies-latest // { extraUnmanagedDeps = /*...*/; }; }` # extraUnmanagedDeps = buildUnmanagedDepsFor hawkSourceInfo; # this will override the output of the same name, example: `buildEmuHawkInstallableFor { bizhawkAssemblies = bizhawkAssemblies-latest // { extraUnmanagedDeps = /*...*/; }; }`
# can similarly override `assets` output, only used by launch script to populate `BIZHAWK_DATA_HOME` if the dir doesn't exist at runtime, # can similarly override `assets` output, only used by launch script to populate `BIZHAWK_DATA_HOME` if the dir doesn't exist at runtime,
# and `waterboxCores` output, which holds just the Waterbox cores, as the name suggests # and `waterboxCores` output, which holds just the Waterbox cores, as the name suggests

3
default.nix
View File

@ -38,6 +38,7 @@ in {
, git ? pkgs.gitMinimal # only when building from-CWD (`-local`) , git ? pkgs.gitMinimal # only when building from-CWD (`-local`)
# rundeps # rundeps
, coreutils ? pkgs.coreutils , coreutils ? pkgs.coreutils
, gnome-themes-extra ? pkgs.gnome3.gnome-themes-extra
, gtk2-x11 ? pkgs.gtk2-x11 , gtk2-x11 ? pkgs.gtk2-x11
, kate ? pkgs.kate.overrideAttrs (oldAttrs: { , kate ? pkgs.kate.overrideAttrs (oldAttrs: {
patches = (oldAttrs.patches or []) ++ [ (fetchpatch { patches = (oldAttrs.patches or []) ++ [ (fetchpatch {
@ -111,7 +112,7 @@ in {
buildDotnetModule fetchpatch fetchzip hardLinkJoin launchScriptsFor makeDesktopItem buildDotnetModule fetchpatch fetchzip hardLinkJoin launchScriptsFor makeDesktopItem
releaseTagSourceInfos runCommand symlinkJoin writeShellScriptBin releaseTagSourceInfos runCommand symlinkJoin writeShellScriptBin
git git
gtk2-x11 libgdiplus libGL lua openal SDL2 udev zstd gnome-themes-extra gtk2-x11 libgdiplus libGL lua openal SDL2 udev zstd
buildConfig doCheck extraDefines extraDotnetBuildFlags; buildConfig doCheck extraDefines extraDotnetBuildFlags;
mono = if mono != null mono = if mono != null
then mono # allow older Mono if set explicitly then mono # allow older Mono if set explicitly