b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #231874 from Atemu/fix/mangohud-layer-name-bitness

Browse source 
mangohud: add bitness suffix to layer name
This commit is contained in:
Atemu 2023-05-15 13:42:28 +02:00 committed by GitHub
parent 6d6c7c5993 7eacc7f549
commit 746a5fc2e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkgs/tools/graphics/mangohud/default.nix
View file

@ -30,6 +30,7 @@
, glfw
, xorg
, gamescopeSupport ? true # build mangoapp and mangohudctl
, lowerBitnessSupport ? stdenv.hostPlatform.is64bit # Support 32 bit on 64bit
, nix-update-script
}:
@ -128,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace bin/mangohud.in \
--subst-var-by libraryPath ${lib.makeSearchPath "lib/mangohud" ([
(placeholder "out")
] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
] ++ lib.optionals lowerBitnessSupport [
mangohud32
])} \
--subst-var-by dataDir ${placeholder "out"}/share
@ -184,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: {
# Support 32bit Vulkan applications by linking in 32bit Vulkan layers
# This is needed for the same reason the 32bit preload workaround is needed.
postInstall = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
postInstall = lib.optionalString lowerBitnessSupport ''
ln -s ${mangohud32}/share/vulkan/implicit_layer.d/MangoHud.x86.json \
"$out/share/vulkan/implicit_layer.d"
@ -194,16 +195,26 @@ stdenv.mkDerivation (finalAttrs: {
''}
'';
postFixup = ''
postFixup = let
archMap = {
"x86_64-linux" = "x86_64";
"i686-linux" = "x86";
};
layerPlatform = archMap."${stdenv.hostPlatform.system}" or null;
# We need to give the different layers separate names or else the loader
# might try the 32-bit one first, fail and not attempt to load the 64-bit
# layer under the same name.
in lib.optionalString (layerPlatform != null) ''
substituteInPlace $out/share/vulkan/implicit_layer.d/MangoHud.${layerPlatform}.json \
--replace "VK_LAYER_MANGOHUD_overlay" "VK_LAYER_MANGOHUD_overlay_${toString stdenv.hostPlatform.parsed.cpu.bits}"
'' + ''
# Add OpenGL driver path to RUNPATH to support NVIDIA cards
addOpenGLRunpath "$out/lib/mangohud/libMangoHud.so"
${lib.optionalString gamescopeSupport ''
addOpenGLRunpath "$out/bin/mangoapp"
''}
${lib.optionalString finalAttrs.doCheck ''
# libcmocka.so is only used for tests
rm "$out/lib/libcmocka.so"
''}
'' + lib.optionalString gamescopeSupport ''
addOpenGLRunpath "$out/bin/mangoapp"
'' + lib.optionalString finalAttrs.doCheck ''
# libcmocka.so is only used for tests
rm "$out/lib/libcmocka.so"
'';
passthru.updateScript = nix-update-script { };