01/02: gnu: wine-staging: Fix source URI for patch versions.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 8252d77f349cdbc4c49e3e7dbf8d2b869c5bacd6
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Wed Jul 8 14:14:54 2020 +0200

    gnu: wine-staging: Fix source URI for patch versions.
    
    * gnu/packages/wine.scm (wine-staging)[source]: Handle X.Y.Z patchset 
versions.
---
 gnu/packages/wine.scm | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index aeec63a..dd33a1a 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -375,19 +375,20 @@ integrate Windows applications into your desktop.")
     (name "wine-staging")
     (version (package-version wine-staging-patchset-data))
     (source
-     (origin
-       (method url-fetch)
-       (uri (let ((dir (string-append
-                        (version-major version)
-                        (if (string-suffix? ".0" (version-major+minor version))
-                            ".0"
-                            ".x"))))
-              (string-append
-               "https://dl.winehq.org/wine/source/"; dir
-               "/wine-" version ".tar.xz")))
-       (file-name (string-append name "-" version ".tar.xz"))
-       (sha256
-        (base32 "1krk68lsfvisi0zpx7890cz0z5bp7jl7rka5d70vwyj3c7109bfb"))))
+     (let* ((wine-version (version-major+minor version))
+            (subdirectory (string-append
+                           (version-major version)
+                           (if (string-suffix? ".0" wine-version)
+                               ".0"
+                               ".x"))))
+       (origin
+         (method url-fetch)
+         (uri (string-append "https://dl.winehq.org/wine/source/";
+                             subdirectory "/"
+                             "wine-" wine-version ".tar.xz"))
+         (file-name (string-append name "-" wine-version ".tar.xz"))
+         (sha256
+          (base32 "1krk68lsfvisi0zpx7890cz0z5bp7jl7rka5d70vwyj3c7109bfb")))))
     (inputs `(("autoconf" ,autoconf)    ; for autoreconf
               ("ffmpeg" ,ffmpeg)
               ("gtk+" ,gtk+)