diff options
| author | Pierre Neidhardt <mail@ambrevar.xyz> | 2019-12-19 16:20:18 +0100 |
|---|---|---|
| committer | Pierre Neidhardt <mail@ambrevar.xyz> | 2019-12-19 16:24:45 +0100 |
| commit | f2c71f62dd0b3d78489cb983c7cdda405ddfffc5 (patch) | |
| tree | 93b7d683bda20edd318a590d798ee885f79a4ce6 /gnu | |
| parent | a21b88f10cabd94636d72284c5b435ba814f125e (diff) | |
| download | guix-f2c71f62dd0b3d78489cb983c7cdda405ddfffc5.tar.gz | |
gnu: dxvk: Update to 1.5.
* gnu/packages/wine.scm (dxvk): Update to 1.5.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/wine.scm | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index d2c0bf0a44..1aaafe8893 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -44,6 +44,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages flex) #:use-module (gnu packages image) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -549,7 +550,7 @@ version)") ;; This package provides 32-bit dxvk libraries on 64-bit systems. (package (name "dxvk32") - (version "1.4.4") + (version "1.5") (home-page "https://github.com/doitsujin/dxvk/") (source (origin (method git-fetch) @@ -559,7 +560,7 @@ version)") (file-name (git-file-name name version)) (sha256 (base32 - "0zr8hqyig18q4wp96cmfrkrgxxbgxida6k8cv6qbbldni29qy20w")))) + "009p99jkskrmy186gsqrf0p3v9z3lskw51r4vdp35af057q26a6x")))) (build-system meson-build-system) (arguments `(#:system "i686-linux" @@ -567,10 +568,14 @@ version)") (string-append (assoc-ref %build-inputs "source") "/build-wine32.txt")))) (native-inputs - `(("glslang" ,glslang) - ("wine" ,wine))) - (synopsis "Vulkan-based D3D11 and D3D10 implementation for Wine") - (description "A Vulkan-based translation layer for Direct3D 10/11 which + ;; Since 1.5 dxvk needs gcc-8.1. See + ;; https://github.com/doitsujin/dxvk/issues/1292#issuecomment-567067373. + `(("gcc" ,gcc-9) + ("glslang" ,glslang))) + (inputs + `(("wine" ,wine-staging))) + (synopsis "Vulkan-based D3D9, D3D10 and D3D11 implementation for Wine") + (description "A Vulkan-based translation layer for Direct3D 9/10/11 which allows running complex 3D applications with high performance using Wine. Use @command{setup_dxvk} to install the required libraries to a Wine prefix.") @@ -615,14 +620,15 @@ Use @command{setup_dxvk} to install the required libraries to a Wine prefix.") ("x86_64-linux" "../lib32") (_ "../lib"))) (("x64") "../lib")))))))) - (native-inputs - `(("glslang" ,glslang))) (inputs `(("wine" ,(match (%current-system) - ("x86_64-linux" wine64) + ;; ("x86_64-linux" wine64) + ("x86_64-linux" wine64-staging) + ;; ("x86_64-linux" mingw-w64-x86_64) (_ wine))) ,@(match (%current-system) ("x86_64-linux" `(("dxvk32" ,dxvk32))) - (_ '())))) + (_ '())) + )) (supported-systems '("i686-linux" "x86_64-linux")))) |