me
/
guix
Archived
1
0
Fork 0
Code

gnu: wine: Adapt Intel Vulkan on i686-linux. 

* gnu/packages/wine.scm (wine)[arguments]: Adjust to also provide Vulkan on
i686-linux for Intel.
* gnu/packages/wine.scm (wine64)[arguments]: Adjust to also provide Vulkan on
i686-linux for Intel.
* gnu/packages/wine.scm (wine-staging)[arguments]: Adjust to also provide
Vulkan on i686-linux for Intel.
* gnu/packages/wine.scm (wine64-staging)[arguments]: Adjust to also provide
Vulkan on i686-linux for Intel.
master
Rutger Helling 2019-08-05 15:41:43 +02:00
parent 3f14c9135b
commit c94884bcc1
No known key found for this signature in database
GPG Key ID: F3A727DB44FCCA36
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnu/packages/wine.scm
View File

@ -164,10 +164,14 @@
(copy-file (string-append (assoc-ref inputs "mesa") (copy-file (string-append (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/radeon_icd.i686.json") "/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")
"/share/vulkan/icd.d/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"))))
#t))))) #t)))))
(_ (_
`()) `())
@ -224,7 +228,9 @@ integrate Windows applications into your desktop.")
(assoc-ref inputs "mesa") (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/intel_icd.x86_64.json" ":" "/share/vulkan/icd.d/intel_icd.x86_64.json" ":"
(assoc-ref inputs "wine") (assoc-ref inputs "wine")
"/share/vulkan/icd.d/radeon_icd.i686.json")))) "/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") (wrap-program (string-append out "/bin/wine64-preloader")
`("VK_ICD_FILENAMES" ":" = `("VK_ICD_FILENAMES" ":" =
(,(string-append (assoc-ref inputs "mesa") (,(string-append (assoc-ref inputs "mesa")
@ -232,7 +238,9 @@ integrate Windows applications into your desktop.")
":" (assoc-ref inputs "mesa") ":" (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/intel_icd.x86_64.json" "/share/vulkan/icd.d/intel_icd.x86_64.json"
":" (assoc-ref inputs "wine") ":" (assoc-ref inputs "wine")
"/share/vulkan/icd.d/radeon_icd.i686.json")))) "/share/vulkan/icd.d/radeon_icd.i686.json"
":" (assoc-ref inputs "wine")
"/share/vulkan/icd.d/intel_icd.i686.json"))))
#t))))) #t)))))
(_ (_
`()) `())
@ -393,10 +401,14 @@ integrate Windows applications into your desktop.")
(copy-file (string-append (assoc-ref inputs "mesa") (copy-file (string-append (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/radeon_icd.i686.json") "/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")
"/share/vulkan/icd.d/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"))))
#t))))) #t)))))
(_ (_
`()) `())
@ -464,7 +476,9 @@ integrated into the main branch.")
(assoc-ref inputs "mesa") (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/intel_icd.x86_64.json" ":" "/share/vulkan/icd.d/intel_icd.x86_64.json" ":"
(assoc-ref inputs "wine-staging") (assoc-ref inputs "wine-staging")
"/share/vulkan/icd.d/radeon_icd.i686.json")))) "/share/vulkan/icd.d/radeon_icd.i686.json" ":"
(assoc-ref inputs "wine-staging")
"/share/vulkan/icd.d/intel_icd.i686.json"))))
(wrap-program (string-append out "/bin/wine64-preloader") (wrap-program (string-append out "/bin/wine64-preloader")
`("VK_ICD_FILENAMES" ":" = `("VK_ICD_FILENAMES" ":" =
(,(string-append (assoc-ref inputs "mesa") (,(string-append (assoc-ref inputs "mesa")
@ -472,7 +486,9 @@ integrated into the main branch.")
":" (assoc-ref inputs "mesa") ":" (assoc-ref inputs "mesa")
"/share/vulkan/icd.d/intel_icd.x86_64.json" "/share/vulkan/icd.d/intel_icd.x86_64.json"
":" (assoc-ref inputs "wine-staging") ":" (assoc-ref inputs "wine-staging")
"/share/vulkan/icd.d/radeon_icd.i686.json")))) "/share/vulkan/icd.d/radeon_icd.i686.json"
":" (assoc-ref inputs "wine-staging")
"/share/vulkan/icd.d/intel_icd.i686.json"))))
#t))))) #t)))))
(_ (_
`()) `())