talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

mangohud: 0.6.9-1 -> 0.7.0

Browse Source
This commit is contained in:
Charles Hall
2023-09-23 12:02:52 -07:00
parent 7ca0ac0859
commit 88ee77c4ec
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/graphics/mangohud/default.nix
View File

@@ -15,6 +15,7 @@
, mangohud32 , mangohud32
, addOpenGLRunpath , addOpenGLRunpath
, appstream , appstream
, git
, glslang , glslang
, mako , mako
, meson , meson
@@ -78,14 +79,14 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "mangohud"; pname = "mangohud";
version = "0.6.9-1"; version = "0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "flightlessmango"; owner = "flightlessmango";
repo = "MangoHud"; repo = "MangoHud";
rev = "refs/tags/v${finalAttrs.version}"; rev = "refs/tags/v${finalAttrs.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-AX4m1XZ+yXp74E3slFGyI3CGu2eYU+eXNN2EY+ivdfk="; hash = "sha256-KkMN7A3AcS/v+b9GCs0pI6MBBk3WwOMciaoiBzL5xOQ=";
}; };
outputs = [ "out" "doc" "man" ]; outputs = [ "out" "doc" "man" ];
@@ -123,13 +124,6 @@ stdenv.mkDerivation (finalAttrs: {
libdbus = dbus.lib; libdbus = dbus.lib;
inherit hwdata; 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 = '' postPatch = ''
@@ -139,6 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals lowerBitnessSupport [ ] ++ lib.optionals lowerBitnessSupport [
mangohud32 mangohud32
])} \ ])} \
--subst-var-by version "${finalAttrs.version}" \
--subst-var-by dataDir ${placeholder "out"}/share --subst-var-by dataDir ${placeholder "out"}/share
( (
@@ -160,6 +155,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ nativeBuildInputs = [
addOpenGLRunpath addOpenGLRunpath
git
glslang glslang
mako mako
meson meson

16
pkgs/tools/graphics/mangohud/preload-nix-workaround.patch
View File

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