01/01: gnu: dxvk: Fix inputs and configure flag expansion.

[guix-commits]

ambrevar pushed a commit to branch master
in repository guix.

commit 223492f35025215f2ea07f61a75e53b96794e6ed
Author: Pierre Neidhardt <address@hidden>
Date:   Sat Nov 2 12:01:49 2019 +0100

    gnu: dxvk: Fix inputs and configure flag expansion.
    
    * gnu/packages/wine.scm (dxvk)[arguments]: Unquote match.
    [native-inputs]: Remove wine and dxvk32...
    [inputs]: ...And add them here.
---
 gnu/packages/wine.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index e561d5c..d2c0bf0 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -585,9 +585,9 @@ Use @command{setup_dxvk} to install the required libraries 
to a Wine prefix.")
      `(#:configure-flags (list "--cross-file"
                                (string-append (assoc-ref %build-inputs 
"source")
                                               "/build-wine"
-                                              (match (%current-system)
-                                                ("x86_64-linux" "64")
-                                                (_ "32"))
+                                              ,(match (%current-system)
+                                                 ("x86_64-linux" "64")
+                                                 (_ "32"))
                                               ".txt"))
        #:phases
        (modify-phases %standard-phases
@@ -616,8 +616,9 @@ Use @command{setup_dxvk} to install the required libraries 
to a Wine prefix.")
                              (_ "../lib")))
                  (("x64") "../lib"))))))))
     (native-inputs
-     `(("glslang" ,glslang)
-       ("wine" ,(match (%current-system)
+     `(("glslang" ,glslang)))
+    (inputs
+     `(("wine" ,(match (%current-system)
                   ("x86_64-linux" wine64)
                   (_ wine)))
        ,@(match (%current-system)