01/01: gnu: wine: Update to 4.0.

[guix-commits]

rhelling pushed a commit to branch master
in repository guix.

commit 0e41f95eec4b1c4dc8a94de087c49c4adfbc9459
Author: Rutger Helling <address@hidden>
Date:   Wed Jan 23 08:52:59 2019 +0100

    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.
---
 gnu/packages/wine.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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