me/guix
Archived
1
0
Fork 0
Code Activity

gnu: wine: Improve formatting of some package definitions.

Browse source 
* gnu/packages/wine.scm (wine, wine64)[arguments]: Fix formatting issues.
This commit is contained in:
Christopher Baines 2020-11-28 14:34:18 +00:00
parent 80c65f30d6
commit e2b4450d18
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 40 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
gnu/packages/wine.scm
View file

@ -171,21 +171,22 @@
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(icd (string-append out "/share/vulkan/icd.d"))) (icd (string-append out "/share/vulkan/icd.d")))
(mkdir-p icd) (mkdir-p icd)
(copy-file (string-append (assoc-ref inputs "mesa") (copy-file (string-append
"/share/vulkan/icd.d/radeon_icd.i686.json") (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/radeon_icd.i686.json")
(string-append icd "/radeon_icd.i686.json")) (string-append icd "/radeon_icd.i686.json"))
(copy-file (string-append (assoc-ref inputs "mesa") (copy-file (string-append
"/share/vulkan/icd.d/intel_icd.i686.json") (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/intel_icd.i686.json")
(string-append icd "/intel_icd.i686.json")) (string-append icd "/intel_icd.i686.json"))
(wrap-program (string-append out "/bin/wine-preloader") (wrap-program (string-append out "/bin/wine-preloader")
`("VK_ICD_FILENAMES" ":" = `("VK_ICD_FILENAMES" ":" =
(,(string-append icd (,(string-append icd
"/radeon_icd.i686.json" ":" "/radeon_icd.i686.json" ":"
icd "/intel_icd.i686.json")))) icd "/intel_icd.i686.json"))))
#t))))) #t)))))
(_ (_
`()) `()))
)
(add-after 'configure 'patch-dlopen-paths (add-after 'configure 'patch-dlopen-paths
;; Hardcode dlopened sonames to absolute paths. ;; Hardcode dlopened sonames to absolute paths.
(lambda _ (lambda _
@ -227,34 +228,35 @@ integrate Windows applications into your desktop.")
;; when installing to x86_64-linux so both are available. ;; when installing to x86_64-linux so both are available.
;; TODO: Add more JSON files as they become available in Mesa. ;; TODO: Add more JSON files as they become available in Mesa.
,@(match (%current-system) ,@(match (%current-system)
((or "x86_64-linux") ((or "x86_64-linux")
`((add-after 'copy-wine32-binaries 'wrap-executable `((add-after 'copy-wine32-binaries 'wrap-executable
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))) (let* ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/wine-preloader") (wrap-program (string-append out "/bin/wine-preloader")
`("VK_ICD_FILENAMES" ":" = `("VK_ICD_FILENAMES" ":" =
(,(string-append (assoc-ref inputs "mesa") (,(string-append
"/share/vulkan/icd.d/radeon_icd.x86_64.json" ":" (assoc-ref inputs "mesa")
(assoc-ref inputs "mesa") "/share/vulkan/icd.d/radeon_icd.x86_64.json" ":"
"/share/vulkan/icd.d/intel_icd.x86_64.json" ":" (assoc-ref inputs "mesa")
(assoc-ref inputs "wine") "/share/vulkan/icd.d/intel_icd.x86_64.json" ":"
"/share/vulkan/icd.d/radeon_icd.i686.json" ":" (assoc-ref inputs "wine")
(assoc-ref inputs "wine") "/share/vulkan/icd.d/radeon_icd.i686.json" ":"
"/share/vulkan/icd.d/intel_icd.i686.json")))) (assoc-ref inputs "wine")
(wrap-program (string-append out "/bin/wine64-preloader") "/share/vulkan/icd.d/intel_icd.i686.json"))))
`("VK_ICD_FILENAMES" ":" = (wrap-program (string-append out "/bin/wine64-preloader")
(,(string-append (assoc-ref inputs "mesa") `("VK_ICD_FILENAMES" ":" =
"/share/vulkan/icd.d/radeon_icd.x86_64.json" (,(string-append
":" (assoc-ref inputs "mesa") (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/intel_icd.x86_64.json" "/share/vulkan/icd.d/radeon_icd.x86_64.json"
":" (assoc-ref inputs "wine") ":" (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/radeon_icd.i686.json" "/share/vulkan/icd.d/intel_icd.x86_64.json"
":" (assoc-ref inputs "wine") ":" (assoc-ref inputs "wine")
"/share/vulkan/icd.d/intel_icd.i686.json")))) "/share/vulkan/icd.d/radeon_icd.i686.json"
#t))))) ":" (assoc-ref inputs "wine")
(_ "/share/vulkan/icd.d/intel_icd.i686.json"))))
`()) #t)))))
) (_
`()))
(add-after 'install 'copy-wine32-binaries (add-after 'install 'copy-wine32-binaries
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((wine32 (assoc-ref %build-inputs "wine")) (let* ((wine32 (assoc-ref %build-inputs "wine"))