mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-04 18:38:57 -05:00
gnu: sdl2: Add vulkan-loader to rpath.
* gnu/packages/sdl.scm (sdl2)[arguments]: Append the path of libvulkan.so to rpath. [inputs]: Add vulkan-loader. Signed-off-by: John Kehayias <john.kehayias@protonmail.com> Change-Id: I17c8388f5f7b3bb063b79fd4981263994da129c0
This commit is contained in:
parent
37fc2c99e0
commit
50521348c8
1 changed files with 9 additions and 4 deletions
|
@ -15,6 +15,7 @@
|
|||
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2023 Evgeny Pisemsky <evgeny@pisemsky.com>
|
||||
;;; Copyright © 2023 dan <i@dan.games>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -60,6 +61,7 @@ (define-module (gnu packages sdl)
|
|||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages pulseaudio)
|
||||
#:use-module (gnu packages gl)
|
||||
#:use-module (gnu packages vulkan)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages xiph)
|
||||
#:use-module (gnu packages xorg)
|
||||
|
@ -133,11 +135,13 @@ (define-public sdl2
|
|||
#$flags))
|
||||
((#:make-flags flags ''())
|
||||
#~(cons*
|
||||
;; SDL dlopens libudev, so make sure it is in rpath. This overrides
|
||||
;; the LDFLAG set in sdl’s configure-flags, which isn’t necessary
|
||||
;; as sdl2 includes Mesa by default.
|
||||
;; SDL dlopens libudev and libvulkan, so make sure they are in
|
||||
;; rpath. This overrides the LDFLAG set in sdl’s configure-flags,
|
||||
;; which isn’t necessary as sdl2 includes Mesa by default.
|
||||
(string-append "LDFLAGS=-Wl,-rpath,"
|
||||
#$(this-package-input "eudev") "/lib")
|
||||
#$(this-package-input "eudev") "/lib"
|
||||
",-rpath,"
|
||||
#$(this-package-input "vulkan-loader") "/lib")
|
||||
#$flags))))
|
||||
(inputs
|
||||
;; SDL2 needs to be built with ibus support otherwise some systems
|
||||
|
@ -151,6 +155,7 @@ (define-public sdl2
|
|||
ibus-minimal
|
||||
libxkbcommon
|
||||
libxcursor ;enables X11 cursor support
|
||||
vulkan-loader
|
||||
wayland
|
||||
wayland-protocols)))
|
||||
(license license:bsd-3)))
|
||||
|
|
Loading…
Reference in a new issue