pyrox.dev
Merge pull request #256958 from CobaltCause/mangohud
mangohud: 0.6.9-1 -> 0.7.0
authored by Kira Bruneau and committed by GitHub 6c225dee 941f7fdf
+6
-11
pkgs/tools/graphics/mangohud/default.nix
+6
-11
pkgs/tools/graphics/mangohud/default.nix
···
3
3
, fetchFromGitLab
4
4
, fetchFromGitHub
5
5
, fetchurl
6
-
, fetchpatch
7
6
, substituteAll
8
7
, coreutils
9
8
, curl
···
16
15
, mangohud32
17
16
, addOpenGLRunpath
18
17
, appstream
18
+
, git
19
19
, glslang
20
20
, mako
21
21
, meson
···
37
37
38
38
let
39
39
# Derived from subprojects/cmocka.wrap
40
-
cmocka = rec {
40
+
cmocka = {
41
41
version = "1.81";
42
42
src = fetchFromGitLab {
43
43
owner = "cmocka";
···
79
79
in
80
80
stdenv.mkDerivation (finalAttrs: {
81
81
pname = "mangohud";
82
-
version = "0.6.9-1";
82
+
version = "0.7.0";
83
83
84
84
src = fetchFromGitHub {
85
85
owner = "flightlessmango";
86
86
repo = "MangoHud";
87
87
rev = "refs/tags/v${finalAttrs.version}";
88
88
fetchSubmodules = true;
89
-
hash = "sha256-AX4m1XZ+yXp74E3slFGyI3CGu2eYU+eXNN2EY+ivdfk=";
89
+
hash = "sha256-KkMN7A3AcS/v+b9GCs0pI6MBBk3WwOMciaoiBzL5xOQ=";
90
90
};
91
91
92
92
outputs = [ "out" "doc" "man" ];
···
124
124
libdbus = dbus.lib;
125
125
inherit hwdata;
126
126
})
127
-
128
-
# Pull gcc-13 build fix for nissing <cstdint>
129
-
(fetchpatch {
130
-
name = "gcc-13.patch";
131
-
url = "https://github.com/flightlessmango/MangoHud/commit/3f8f036ee8773ae1af23dd0848b6ab487b5ac7de.patch";
132
-
hash = "sha256-qbNywAXAStGiVZ1LA5qZyNp4n28iNUuE4N69zXv2gmM=";
133
-
})
134
127
];
135
128
136
129
postPatch = ''
···
140
133
] ++ lib.optionals lowerBitnessSupport [
141
134
mangohud32
142
135
])} \
136
+
--subst-var-by version "${finalAttrs.version}" \
143
137
--subst-var-by dataDir ${placeholder "out"}/share
144
138
145
139
(
···
161
155
162
156
nativeBuildInputs = [
163
157
addOpenGLRunpath
158
+
git
164
159
glslang
165
160
mako
166
161
meson
+8
-8
pkgs/tools/graphics/mangohud/preload-nix-workaround.patch
+8
-8
pkgs/tools/graphics/mangohud/preload-nix-workaround.patch
···
1
1
diff --git a/bin/mangohud.in b/bin/mangohud.in
2
-
index f975224..24936eb 100755
2
+
index 6c3c6e8..8847cdc 100755
3
3
--- a/bin/mangohud.in
4
4
+++ b/bin/mangohud.in
5
-
@@ -8,16 +8,18 @@ if [ "$#" -eq 0 ]; then
5
+
@@ -8,10 +8,10 @@ if [ "$#" -eq 0 ]; then
6
6
exit 1
7
7
fi
8
8
9
-
-MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud.so"
10
-
+MANGOHUD_LIB_NAME="libMangoHud.so"
9
+
-MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_opengl.so"
10
+
+MANGOHUD_LIB_NAME="libMangoHud_opengl.so"
11
11
12
12
if [ "$1" = "--dlsym" ]; then
13
-
MANGOHUD_DLSYM=1
14
13
- MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}"
15
14
+ MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}"
16
15
shift
17
16
fi
18
17
19
-
# Preload using the plain filenames of the libs, the dynamic linker will
20
-
# figure out whether the 32 or 64 bit version should be used
21
-
LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${MANGOHUD_LIB_NAME}"
18
+
@@ -31,5 +31,7 @@ case ":${LD_PRELOAD-}:" in
19
+
LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${MANGOHUD_LIB_NAME}"
20
+
esac
21
+
22
22
+LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
23
23
+XDG_DATA_DIRS="@dataDir@${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
24
24