me/guix
Archived
1
0
Fork 0
Code Activity

gnu: sdl2: Add vulkan-loader to rpath.

Browse source 
* 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:
dan 2023-08-09 01:49:52 +08:00 • committed by John Kehayias
parent 37fc2c99e0
commit 50521348c8
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/sdl.scm
View file

@ -15,6 +15,7 @@
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Evgeny Pisemsky <evgeny@pisemsky.com> ;;; Copyright © 2023 Evgeny Pisemsky <evgeny@pisemsky.com>
;;; Copyright © 2023 dan <i@dan.games>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -60,6 +61,7 @@
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio) #:use-module (gnu packages pulseaudio)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages vulkan)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xiph) #:use-module (gnu packages xiph)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
@ -133,11 +135,13 @@ joystick, and graphics hardware.")
#$flags)) #$flags))
((#:make-flags flags ''()) ((#:make-flags flags ''())
#~(cons* #~(cons*
;; SDL dlopens libudev, so make sure it is in rpath. This overrides ;; SDL dlopens libudev and libvulkan, so make sure they are in
;; the LDFLAG set in sdl’s configure-flags, which isn’t necessary ;; rpath. This overrides the LDFLAG set in sdl’s configure-flags,
;; as sdl2 includes Mesa by default. ;; which isn’t necessary as sdl2 includes Mesa by default.
(string-append "LDFLAGS=-Wl,-rpath," (string-append "LDFLAGS=-Wl,-rpath,"
#$(this-package-input "eudev") "/lib") #$(this-package-input "eudev") "/lib"
",-rpath,"
#$(this-package-input "vulkan-loader") "/lib")
#$flags)))) #$flags))))
(inputs (inputs
;; SDL2 needs to be built with ibus support otherwise some systems ;; SDL2 needs to be built with ibus support otherwise some systems
@ -151,6 +155,7 @@ joystick, and graphics hardware.")
ibus-minimal ibus-minimal
libxkbcommon libxkbcommon
libxcursor ;enables X11 cursor support libxcursor ;enables X11 cursor support
vulkan-loader
wayland wayland
wayland-protocols))) wayland-protocols)))
(license license:bsd-3))) (license license:bsd-3)))