me/guix
Archived
1
0
Fork 0
Code Activity

gnu: dxvk: Fix inputs and configure flag expansion.

Browse source 
* gnu/packages/wine.scm (dxvk)[arguments]: Unquote match.
[native-inputs]: Remove wine and dxvk32...
[inputs]: ...And add them here.
This commit is contained in:
Pierre Neidhardt 2019-11-02 12:01:49 +01:00
parent ab1c063ab0
commit 223492f350
No known key found for this signature in database
GPG key ID: 9BDCF497A4BBCC7F
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/wine.scm
View file

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