aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/wine.scm
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2020-11-28 14:34:18 +0000
committerChristopher Baines <mail@cbaines.net>2020-11-28 14:37:38 +0000
commite2b4450d188320783a35086d52c14ac9d47cf7f0 (patch)
treea8af71b6af42378e79219174fc16b94875176149 /gnu/packages/wine.scm
parent80c65f30d6fa3e928aef41310f71bf17a4871bcc (diff)
downloadguix-e2b4450d188320783a35086d52c14ac9d47cf7f0.tar
guix-e2b4450d188320783a35086d52c14ac9d47cf7f0.tar.gz
gnu: wine: Improve formatting of some package definitions.
* gnu/packages/wine.scm (wine, wine64)[arguments]: Fix formatting issues.
Diffstat (limited to 'gnu/packages/wine.scm')
-rw-r--r--gnu/packages/wine.scm78
1 files changed, 40 insertions, 38 deletions
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 492eea0587..0d93af0dc9 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -171,21 +171,22 @@
(let* ((out (assoc-ref outputs "out"))
(icd (string-append out "/share/vulkan/icd.d")))
(mkdir-p icd)
- (copy-file (string-append (assoc-ref inputs "mesa")
- "/share/vulkan/icd.d/radeon_icd.i686.json")
+ (copy-file (string-append
+ (assoc-ref inputs "mesa")
+ "/share/vulkan/icd.d/radeon_icd.i686.json")
(string-append icd "/radeon_icd.i686.json"))
- (copy-file (string-append (assoc-ref inputs "mesa")
- "/share/vulkan/icd.d/intel_icd.i686.json")
+ (copy-file (string-append
+ (assoc-ref inputs "mesa")
+ "/share/vulkan/icd.d/intel_icd.i686.json")
(string-append icd "/intel_icd.i686.json"))
(wrap-program (string-append out "/bin/wine-preloader")
- `("VK_ICD_FILENAMES" ":" =
- (,(string-append icd
- "/radeon_icd.i686.json" ":"
- icd "/intel_icd.i686.json"))))
+ `("VK_ICD_FILENAMES" ":" =
+ (,(string-append icd
+ "/radeon_icd.i686.json" ":"
+ icd "/intel_icd.i686.json"))))
#t)))))
(_
- `())
- )
+ `()))
(add-after 'configure 'patch-dlopen-paths
;; Hardcode dlopened sonames to absolute paths.
(lambda _
@@ -227,34 +228,35 @@ integrate Windows applications into your desktop.")
;; when installing to x86_64-linux so both are available.
;; TODO: Add more JSON files as they become available in Mesa.
,@(match (%current-system)
- ((or "x86_64-linux")
- `((add-after 'copy-wine32-binaries 'wrap-executable
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/wine-preloader")
- `("VK_ICD_FILENAMES" ":" =
- (,(string-append (assoc-ref inputs "mesa")
- "/share/vulkan/icd.d/radeon_icd.x86_64.json" ":"
- (assoc-ref inputs "mesa")
- "/share/vulkan/icd.d/intel_icd.x86_64.json" ":"
- (assoc-ref inputs "wine")
- "/share/vulkan/icd.d/radeon_icd.i686.json" ":"
- (assoc-ref inputs "wine")
- "/share/vulkan/icd.d/intel_icd.i686.json"))))
- (wrap-program (string-append out "/bin/wine64-preloader")
- `("VK_ICD_FILENAMES" ":" =
- (,(string-append (assoc-ref inputs "mesa")
- "/share/vulkan/icd.d/radeon_icd.x86_64.json"
- ":" (assoc-ref inputs "mesa")
- "/share/vulkan/icd.d/intel_icd.x86_64.json"
- ":" (assoc-ref inputs "wine")
- "/share/vulkan/icd.d/radeon_icd.i686.json"
- ":" (assoc-ref inputs "wine")
- "/share/vulkan/icd.d/intel_icd.i686.json"))))
- #t)))))
- (_
- `())
- )
+ ((or "x86_64-linux")
+ `((add-after 'copy-wine32-binaries 'wrap-executable
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (wrap-program (string-append out "/bin/wine-preloader")
+ `("VK_ICD_FILENAMES" ":" =
+ (,(string-append
+ (assoc-ref inputs "mesa")
+ "/share/vulkan/icd.d/radeon_icd.x86_64.json" ":"
+ (assoc-ref inputs "mesa")
+ "/share/vulkan/icd.d/intel_icd.x86_64.json" ":"
+ (assoc-ref inputs "wine")
+ "/share/vulkan/icd.d/radeon_icd.i686.json" ":"
+ (assoc-ref inputs "wine")
+ "/share/vulkan/icd.d/intel_icd.i686.json"))))
+ (wrap-program (string-append out "/bin/wine64-preloader")
+ `("VK_ICD_FILENAMES" ":" =
+ (,(string-append
+ (assoc-ref inputs "mesa")
+ "/share/vulkan/icd.d/radeon_icd.x86_64.json"
+ ":" (assoc-ref inputs "mesa")
+ "/share/vulkan/icd.d/intel_icd.x86_64.json"
+ ":" (assoc-ref inputs "wine")
+ "/share/vulkan/icd.d/radeon_icd.i686.json"
+ ":" (assoc-ref inputs "wine")
+ "/share/vulkan/icd.d/intel_icd.i686.json"))))
+ #t)))))
+ (_
+ `()))
(add-after 'install 'copy-wine32-binaries
(lambda* (#:key outputs #:allow-other-keys)
(let* ((wine32 (assoc-ref %build-inputs "wine"))