diff options
| author | Rutger Helling <rhelling@mykolab.com> | 2019-08-05 15:41:43 +0200 |
|---|---|---|
| committer | Rutger Helling <rhelling@mykolab.com> | 2019-08-05 16:47:36 +0200 |
| commit | c94884bcc1d762578077ccc84a7f45d87b38cd46 (patch) | |
| tree | 3af035bfd0c9045b1d6cd4eaeb7a4cbfd41d3c61 /gnu/packages/wine.scm | |
| parent | 3f14c9135b2d264a6c5ead49c09ee569247625d5 (diff) | |
| download | guix-c94884bcc1d762578077ccc84a7f45d87b38cd46.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/wine.scm')
| -rw-r--r-- | gnu/packages/wine.scm | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index fd7277a7af..43dae3cf7c 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -164,10 +164,14 @@ (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") + (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")))) + "/radeon_icd.i686.json" ":" + icd "/intel_icd.i686.json")))) #t))))) (_ `()) @@ -224,7 +228,9 @@ integrate Windows applications into your desktop.") (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")))) + "/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") @@ -232,7 +238,9 @@ integrate Windows applications into your desktop.") ":" (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")))) + "/share/vulkan/icd.d/radeon_icd.i686.json" + ":" (assoc-ref inputs "wine") + "/share/vulkan/icd.d/intel_icd.i686.json")))) #t))))) (_ `()) @@ -393,10 +401,14 @@ integrate Windows applications into your desktop.") (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") + (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")))) + "/radeon_icd.i686.json" ":" + icd "/intel_icd.i686.json")))) #t))))) (_ `()) @@ -464,7 +476,9 @@ integrated into the main branch.") (assoc-ref inputs "mesa") "/share/vulkan/icd.d/intel_icd.x86_64.json" ":" (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") `("VK_ICD_FILENAMES" ":" = (,(string-append (assoc-ref inputs "mesa") @@ -472,7 +486,9 @@ integrated into the main branch.") ":" (assoc-ref inputs "mesa") "/share/vulkan/icd.d/intel_icd.x86_64.json" ":" (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))))) (_ `()) |