guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: retroarch: Fix wayland backend.


From: guix-commits
Subject: 01/01: gnu: retroarch: Fix wayland backend.
Date: Tue, 5 Feb 2019 05:37:56 -0500 (EST)

rhelling pushed a commit to branch master
in repository guix.

commit 12a3abc6cc1757a413bdfa7a06d62ae0616b9a68
Author: Rutger Helling <address@hidden>
Date:   Tue Feb 5 11:36:22 2019 +0100

    gnu: retroarch: Fix wayland backend.
    
    * gnu/packages/emulators.scm (retroarch): Fix wayland backend.
    [arguments]: Hard-code wayland-protocols.
    [native-inputs]: Add wayland-protocols.
---
 gnu/packages/emulators.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 5145c19..184a3bc 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1072,10 +1072,14 @@ emulation community.  It provides highly accurate 
emulation.")
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
                     (etc (string-append out "/etc"))
-                    (vulkan (assoc-ref inputs "vulkan-loader")))
+                    (vulkan (assoc-ref inputs "vulkan-loader"))
+                    (wayland-protocols (assoc-ref inputs "wayland-protocols")))
                ;; Hard-code the path to libvulkan.so.
                (substitute* "gfx/common/vulkan_common.c"
                  (("libvulkan.so") (string-append vulkan "/lib/libvulkan.so")))
+               (substitute* "gfx/common/wayland/generate_wayland_protos.sh"
+                 (("/usr/local/share/wayland-protocols")
+                 (string-append wayland-protocols "/share/wayland-protocols")))
                (substitute* "qb/qb.libs.sh"
                  (("/bin/true") (which "true")))
                ;; Use shared zlib.
@@ -1114,6 +1118,7 @@ emulation community.  It provides highly accurate 
emulation.")
        ("zlib" ,zlib)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
+       ("wayland-protocols" ,wayland-protocols)
        ("which" ,which)))
     (home-page "https://www.libretro.com/";)
     (synopsis "Reference frontend for the libretro API")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]