Merge pull request #256958 from CobaltCause/mangohud

mangohud: 0.6.9-1 -> 0.7.0
This commit is contained in:
Kira Bruneau 2023-09-29 09:04:11 -04:00 committed by GitHub
commit 6c225dee3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 19 deletions

View File

@ -3,7 +3,6 @@
, fetchFromGitLab
, fetchFromGitHub
, fetchurl
, fetchpatch
, substituteAll
, coreutils
, curl
@ -16,6 +15,7 @@
, mangohud32
, addOpenGLRunpath
, appstream
, git
, glslang
, mako
, meson
@ -37,7 +37,7 @@
let
# Derived from subprojects/cmocka.wrap
cmocka = rec {
cmocka = {
version = "1.81";
src = fetchFromGitLab {
owner = "cmocka";
@ -79,14 +79,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "mangohud";
version = "0.6.9-1";
version = "0.7.0";
src = fetchFromGitHub {
owner = "flightlessmango";
repo = "MangoHud";
rev = "refs/tags/v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-AX4m1XZ+yXp74E3slFGyI3CGu2eYU+eXNN2EY+ivdfk=";
hash = "sha256-KkMN7A3AcS/v+b9GCs0pI6MBBk3WwOMciaoiBzL5xOQ=";
};
outputs = [ "out" "doc" "man" ];
@ -124,13 +124,6 @@ stdenv.mkDerivation (finalAttrs: {
libdbus = dbus.lib;
inherit hwdata;
})
# Pull gcc-13 build fix for nissing <cstdint>
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/flightlessmango/MangoHud/commit/3f8f036ee8773ae1af23dd0848b6ab487b5ac7de.patch";
hash = "sha256-qbNywAXAStGiVZ1LA5qZyNp4n28iNUuE4N69zXv2gmM=";
})
];
postPatch = ''
@ -140,6 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals lowerBitnessSupport [
mangohud32
])} \
--subst-var-by version "${finalAttrs.version}" \
--subst-var-by dataDir ${placeholder "out"}/share
(
@ -161,6 +155,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
addOpenGLRunpath
git
glslang
mako
meson

View File

@ -1,24 +1,24 @@
diff --git a/bin/mangohud.in b/bin/mangohud.in
index f975224..24936eb 100755
index 6c3c6e8..8847cdc 100755
--- a/bin/mangohud.in
+++ b/bin/mangohud.in
@@ -8,16 +8,18 @@ if [ "$#" -eq 0 ]; then
@@ -8,10 +8,10 @@ if [ "$#" -eq 0 ]; then
exit 1
fi
-MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud.so"
+MANGOHUD_LIB_NAME="libMangoHud.so"
-MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_opengl.so"
+MANGOHUD_LIB_NAME="libMangoHud_opengl.so"
if [ "$1" = "--dlsym" ]; then
MANGOHUD_DLSYM=1
- MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}"
+ MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}"
shift
fi
# Preload using the plain filenames of the libs, the dynamic linker will
# figure out whether the 32 or 64 bit version should be used
@@ -31,5 +31,7 @@ case ":${LD_PRELOAD-}:" in
LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${MANGOHUD_LIB_NAME}"
esac
+LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+XDG_DATA_DIRS="@dataDir@${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"