From 50521348c89140705ca157a7d77f4acda24c26c7 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 9 Aug 2023 01:49:52 +0800 Subject: 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 Change-Id: I17c8388f5f7b3bb063b79fd4981263994da129c0 --- gnu/packages/sdl.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu/packages/sdl.scm') 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 ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2023 Evgeny Pisemsky +;;; Copyright © 2023 dan ;;; ;;; 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))) -- cgit v1.2.3