GNU bug report logs - #65153
[PATCH] gnu: sdl2: Add vulkan-loader to rpath.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 65153 in the body.
You can then email your comments to 65153 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: dan <i <at> dan.games>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: sdl2: Add vulkan-loader to rpath.
Date: Wed,  9 Aug 2023 01:49:52 +0800

* gnu/packages/sdl.scm (sdl2)
  [arguments]: Append the path to libvulkan.so to rpath.
  [inputs]: Add vulkan-loader.
---
 gnu/packages/sdl.scm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 86ec1c033b..bb9fb19f9e 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2020 Timotej Lazar <timotej.lazar <at> araneo.si>
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust <at> gmail.com>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2023 dan <i <at> dan.games>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -59,6 +60,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)
@@ -132,11 +134,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)))
@@ -681,3 +686,4 @@ (define-public guile2.2-sdl2
 
 (define-public guile3.0-sdl2
   (deprecated-package "guile3.0-sdl2" guile-sdl2))
+sdl2

base-commit: 4547bc6fa3142dca77f7fc912368aeff31bd6e53
-- 
2.41.0

Message #10 received at 65153-done <at> debbugs.gnu.org (full text, mbox):

From: John Kehayias <john.kehayias <at> protonmail.com>
To: dan <i <at> dan.games>
Cc: 65153-done <at> debbugs.gnu.org
Subject: Re: [bug#65153] [PATCH] gnu: sdl2: Add vulkan-loader to rpath.
Date: Tue, 28 Nov 2023 05:49:12 +0000

On Wed, Aug 09, 2023 at 01:49 AM, dan wrote:

> * gnu/packages/sdl.scm (sdl2)
>   [arguments]: Append the path to libvulkan.so to rpath.
>   [inputs]: Add vulkan-loader.
> ---
>  gnu/packages/sdl.scm | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
> index 86ec1c033b..bb9fb19f9e 100644
> --- a/gnu/packages/sdl.scm
> +++ b/gnu/packages/sdl.scm
> @@ -14,6 +14,7 @@
>  ;;; Copyright © 2020 Timotej Lazar <timotej.lazar <at> araneo.si>
>  ;;; Copyright © 2020 Oleg Pykhalov <go.wigust <at> gmail.com>
>  ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
> +;;; Copyright © 2023 dan <i <at> dan.games>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -59,6 +60,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)
> @@ -132,11 +134,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)))
> @@ -681,3 +686,4 @@ (define-public guile2.2-sdl2
>
>  (define-public guile3.0-sdl2
>    (deprecated-package "guile3.0-sdl2" guile-sdl2))
> +sdl2
>
> base-commit: 4547bc6fa3142dca77f7fc912368aeff31bd6e53

Pushed as 50521348c89140705ca157a7d77f4acda24c26c7 thanks!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.