gnu: wine: Update to 4.0.

* gnu/packages/wine.scm (wine): Update to 4.0.
[inputs]: Add sdl2 and vulkan-loader.
* gnu/packages/wine.scm (wine-staging)[inputs]: Remove sdl2 and vulkan-loader,
inherit from wine instead.
This commit is contained in:
Rutger Helling 2019-01-23 08:52:59 +01:00
parent 6a6799b27a
commit 0e41f95eec
No known key found for this signature in database
GPG Key ID: F3A727DB44FCCA36
1 changed files with 4 additions and 4 deletions

View File

@ -71,7 +71,7 @@
(define-public wine (define-public wine
(package (package
(name "wine") (name "wine")
(version "3.0.4") (version "4.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dl.winehq.org/wine/source/" (uri (string-append "https://dl.winehq.org/wine/source/"
@ -79,7 +79,7 @@
"/wine-" version ".tar.xz")) "/wine-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"037vlrk80lagy362w7500i2ldwvdwsadrknajzi67cvxpvnqhnnl")))) "0k8d90mgjzv8vjspmnxzr3i5mbccxnbr9hf03q1bpf5jjppcsdk7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
@ -122,8 +122,10 @@
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("openal" ,openal) ("openal" ,openal)
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("sdl2" ,sdl2)
("unixodbc" ,unixodbc) ("unixodbc" ,unixodbc)
("v4l-utils" ,v4l-utils) ("v4l-utils" ,v4l-utils)
("vulkan-loader" ,vulkan-loader)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
`(;; Force a 32-bit build targeting a similar architecture, i.e.: `(;; Force a 32-bit build targeting a similar architecture, i.e.:
@ -288,10 +290,8 @@ integrate Windows applications into your desktop.")
("libva" ,libva) ("libva" ,libva)
("mesa" ,mesa) ("mesa" ,mesa)
("python" ,python) ("python" ,python)
("sdl2" ,sdl2)
("util-linux" ,util-linux) ; for hexdump ("util-linux" ,util-linux) ; for hexdump
("vkd3d" ,vkd3d) ("vkd3d" ,vkd3d)
("vulkan-loader" ,vulkan-loader)
("wine-staging-patchset-data" ,wine-staging-patchset-data) ("wine-staging-patchset-data" ,wine-staging-patchset-data)
,@(package-inputs wine))) ,@(package-inputs wine)))
(arguments (arguments