[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/12: gnu: sdl2: Add vulkan-loader to rpath.
From: |
guix-commits |
Subject: |
11/12: gnu: sdl2: Add vulkan-loader to rpath. |
Date: |
Sun, 5 Nov 2023 23:11:32 -0500 (EST) |
podiki pushed a commit to branch mesa-updates
in repository guix.
commit 50521348c89140705ca157a7d77f4acda24c26c7
Author: dan <i@dan.games>
AuthorDate: Wed Aug 9 01:49:52 2023 +0800
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
---
gnu/packages/sdl.scm | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index a4ee654097..ef0fe7f9ad 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -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 @@
#: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 @@ joystick, and graphics hardware.")
#$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 @@ joystick, and graphics hardware.")
ibus-minimal
libxkbcommon
libxcursor ;enables X11 cursor support
+ vulkan-loader
wayland
wayland-protocols)))
(license license:bsd-3)))
- branch mesa-updates created (now 97f292b47f), guix-commits, 2023/11/05
- 06/12: gnu: nghttp2: Update to 1.58.0 and ungraft., guix-commits, 2023/11/05
- 07/12: gnu: curl: Ungraft., guix-commits, 2023/11/05
- 09/12: gnu: mesa: Update to 23.2.1., guix-commits, 2023/11/05
- 02/12: gnu: libxpm: Ungraft., guix-commits, 2023/11/05
- 10/12: gnu: libepoxy: Hardcode paths to GLES libraries., guix-commits, 2023/11/05
- 05/12: gnu: libxkbcommon: Update to 1.6.0., guix-commits, 2023/11/05
- 12/12: gnu: sdl2: Update to 2.28.5., guix-commits, 2023/11/05
- 11/12: gnu: sdl2: Add vulkan-loader to rpath.,
guix-commits <=
- 08/12: gnu: curl: Run tests in parallel., guix-commits, 2023/11/05
- 04/12: gnu: libdrm: Update to 2.4.117., guix-commits, 2023/11/05
- 03/12: gnu: pixman: Update to 0.42.2., guix-commits, 2023/11/05
- 01/12: gnu: libx11: Ungraft., guix-commits, 2023/11/05