From 12a3abc6cc1757a413bdfa7a06d62ae0616b9a68 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Tue, 5 Feb 2019 11:36:22 +0100
Subject: 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 5145c19f29..184a3bc859 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")
-- 
cgit v1.2.3

ss='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=4ae1f8cf394dd462ec3395a74b55965c9d019ede'>root</a>/<a href='/guix/log/tests?id=4ae1f8cf394dd462ec3395a74b55965c9d019ede'>tests</a>/<a href='/guix/log/tests/union.scm?id=4ae1f8cf394dd462ec3395a74b55965c9d019ede'>union.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/union.scm?id=4ae1f8cf394dd462ec3395a74b55965c9d019ede&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2016-04-03 14:19:09 +0200'>2016-04-03</span></td><td><a href='/guix/commit/tests/union.scm?id=a9edb211e733b8b34e67ec3b4450567e9376986f'>build: Add a Guile custom test driver using SRFI-64.</a><span class='msg-avail'>...</span></td><td>Mathieu Lirzin</td></tr>
<tr><td><span title='2015-02-24 00:01:34 +0100'>2015-02-24</span></td><td><a href='/guix/commit/tests/union.scm?id=12d720fd1a9c43019f2d5afa051b45c7633b3ab0'>tests: Factorize the network reachability test.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2014-08-23 22:33:04 +0200'>2014-08-23</span></td><td><a href='/guix/commit/tests/union.scm?id=c1bc358f293b97c9575f6195c3e7a119b05199ce'>Factorize test suite support in (guix tests).</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>