ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mangohud: Update to 0.7.0.

Browse source 
* gnu/packages/graphics.scm (mangohud): Update to 0.7.0.
[arguments]<#:configure-flags>: Remove "-Duse_system_vulkan=enabled" and
"-Dvulkan_datadir" from as they are no longer supported.
<#:phases>: Add 'unbundle-vulkan-headers'.
[inputs]: Add nlohmann-json.  Replace vulkan-headers with origin for
vulkan-headers@1.2.158.
[native-inputs]: Add git-minimal/pinned.
This commit is contained in:
John Kehayias 2023-10-09 00:08:27 -04:00
parent 08c55c03bf
commit 5a6b1a5586
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9
1 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
gnu/packages/graphics.scm
View file

@ -28,7 +28,7 @@
;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2021, 2022 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2022 Tobias Kortkamp <tobias.kortkamp@gmail.com>
;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
@ -121,6 +121,7 @@ (define-module (gnu packages graphics)
#:use-module (gnu packages tbb)
#:use-module (gnu packages toolkits)
#:use-module (gnu packages upnp)
#:use-module (gnu packages version-control)
#:use-module (gnu packages video)
#:use-module (gnu packages vulkan)
#:use-module (gnu packages xiph)
@ -1038,7 +1039,7 @@ (define-public alembic
(define-public mangohud
(package
(name "mangohud")
(version "0.6.8")
(version "0.7.0")
(source
(origin
(method git-fetch)
@ -1047,21 +1048,18 @@ (define-public mangohud
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "19dp8l5njzl9xah0bhwlkl39vc8w2rnpvpdrhgaz3hnhz8b0r5df"))))
(base32 "1m4a2dqzqdhk9w1gvzppid7k0fxvplh5hmivvj9sda529s1g24rc"))))
(build-system meson-build-system)
(arguments
(list
#:build-type "release"
#:configure-flags
#~(list "-Duse_system_vulkan=enabled"
"-Duse_system_spdlog=enabled"
#~(list "-Duse_system_spdlog=enabled"
"-Dwith_xnvctrl=disabled"
"-Dappend_libdir_mangohud=false"
(string-append "-Dvulkan_datadir="
#$(this-package-input "vulkan-headers") "/share"))
"-Dappend_libdir_mangohud=false")
#:phases
#~(modify-phases %standard-phases
;; Mangohud tries to build the imgui library as a meson submodule,
;; MangoHud tries to build the imgui library as a meson submodule,
;; so we change the dependency to the imgui input instead.
(add-after 'unpack 'unbundle-imgui
(lambda _
@ -1073,6 +1071,23 @@ (define-public mangohud
"declare_dependency(dependencies: "
"cpp.find_library('imgui'), include_directories: '"
#$(this-package-input "imgui") "/include/imgui')")))))
;; Likewise, MangoHud bundles a Vulkan headers submodule to use a
;; specific version, which we provide as an input and adjust the
;; build accordingly.
(add-after 'unbundle-imgui 'unbundle-vulkan-headers
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "meson.build"
(("vkh_sp = .*")
"")
(("vkh_sp.get_variable\\('vulkan_api_xml'\\)")
(string-append "files('"
(search-input-file inputs "registry/vk.xml")
"')"))
(("dep_vulkan = .*")
""))
(substitute* "src/meson.build"
(("dep_vulkan,")
""))))
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/meson.build"
@ -1098,11 +1113,20 @@ (define-public mangohud
libx11
mesa
mesa-utils
nlohmann-json
python-mako
spdlog
vulkan-headers
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KhronosGroup/Vulkan-Headers")
(commit "v1.2.158")))
(file-name (git-file-name "vulkan" "v1.2.158"))
(sha256
(base32
"0jvaqj87792yccpr290djb18pqaisspq9dw6bqim6mrhfgda9v76")))
vulkan-loader))
(native-inputs (list pkg-config python))
(native-inputs (list git-minimal/pinned pkg-config python))
(home-page "https://github.com/flightlessmango/MangoHud/")
(synopsis "Vulkan and OpenGL overlay for monitoring performance and hardware")
(description "MangoHud is a Vulkan and OpenGL overlay for monitoring