diff options
Diffstat (limited to 'gnu/packages/wine.scm')
| -rw-r--r-- | gnu/packages/wine.scm | 43 |
1 files changed, 27 insertions, 16 deletions
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 62cf225ceb..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))))) (_ `()) @@ -310,7 +318,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "4.12.1") + (version "4.13") (source (origin (method git-fetch) @@ -320,7 +328,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "1bvpvj6vcw2p6vcjm6mw5maarbs4lfw1ix3pj020w4n3kg4nmmc4")))) + "0bbwsd2qpjilxpjscqbp78p0gl0awj1yj62g0wvybh4x89fzy8zj")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -366,7 +374,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "09yjfb2k14y11k19lm8dqmb8qwxyhh67d5q1gqv480y64mljvkx0")))) + "0rqx8g394aj5q913cd18zsi60sldvxarrp178w6ja0y4rd8l25vr")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("faudio" ,faudio) ("ffmpeg" ,ffmpeg) @@ -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))))) (_ `()) @@ -407,10 +419,7 @@ integrate Windows applications into your desktop.") (script (string-append (assoc-ref %build-inputs "wine-staging-patchset-data") "/share/wine-staging/patches/patchinstall.sh"))) - ;; Exclude specific patches that conflict with FAudio. - (invoke script (string-append "DESTDIR=" ".") "--all" "-W" - "xaudio2-revert" "-W" "xaudio2_CommitChanges" "-W" - "xaudio2_7-WMA_support" "-W" "xaudio2_7-CreateFX-FXEcho") + (invoke script (string-append "DESTDIR=" ".") "--all") #t))) (add-after 'configure 'patch-dlopen-paths ;; Hardcode dlopened sonames to absolute paths. @@ -467,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") @@ -475,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))))) (_ `()) @@ -487,9 +500,7 @@ integrated into the main branch.") "wine-staging-patchset-data") "/share/wine-staging/patches/patchinstall.sh"))) ;; Exclude specific patches that conflict with FAudio. - (invoke script (string-append "DESTDIR=" ".") "--all" "-W" - "xaudio2-revert" "-W" "xaudio2_CommitChanges" "-W" - "xaudio2_7-WMA_support" "-W" "xaudio2_7-CreateFX-FXEcho") + (invoke script (string-append "DESTDIR=" ".") "--all") #t))) (add-after 'install 'copy-wine32-binaries (lambda* (#:key outputs #:allow-other-keys) |