ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 23:46:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: wine: Update to 6.14.

Browse source 
* gnu/packages/wine.scm (wine): Update to 6.14.
[#:phases]: Patch Makefile to correctly locate ntdll.so.
(wine64)[#:phases]: Likewise.
This commit is contained in:
Leo Prikler 2021-08-05 21:10:05 +02:00
parent b12d856da9
commit 0732870631
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/wine.scm
View file

@ -75,7 +75,7 @@ (define-module (gnu packages wine)
(define-public wine (define-public wine
(package (package
(name "wine") (name "wine")
(version "6.8") (version "6.14")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -87,7 +87,7 @@ (define-public wine
(string-append "https://dl.winehq.org/wine/source/" dir (string-append "https://dl.winehq.org/wine/source/" dir
"wine-" version ".tar.xz"))) "wine-" version ".tar.xz")))
(sha256 (sha256
(base32 "1n7bd6kkhfgi23bz981qml3lajgvbs3ibqrc2mqjhhfqczg2shjv")))) (base32 "00jjqbl0xzsp2swzxgx3a2b16p26qbxvcz82a7ihig23k69p3d34"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
@ -194,7 +194,16 @@ (define-public wine
(substitute* "include/config.h" (substitute* "include/config.h"
(("(#define SONAME_.* )\"(.*)\"" _ defso soname) (("(#define SONAME_.* )\"(.*)\"" _ defso soname)
(format #f "~a\"~a\"" defso (find-so soname)))) (format #f "~a\"~a\"" defso (find-so soname))))
#t)))))) #t)))
(add-after 'patch-generated-file-shebangs 'patch-makefile
(lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "Makefile") ; Makefile is first regenerated
(substitute* "Makefile"
(("-lntdll" id)
(string-append id
" -Wl,-rpath=" (assoc-ref outputs "out")
"/lib/wine32/wine/$(ARCH)-unix")))
#t)))))
(home-page "https://www.winehq.org/") (home-page "https://www.winehq.org/")
(synopsis "Implementation of the Windows API (32-bit only)") (synopsis "Implementation of the Windows API (32-bit only)")
(description (description
@ -254,6 +263,15 @@ (define-public wine64
#t))))) #t)))))
(_ (_
`())) `()))
(add-after 'patch-generated-file-shebangs 'patch-makefile
(lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "Makefile") ; Makefile is first regenerated
(substitute* "Makefile"
(("-lntdll" id)
(string-append id
" -Wl,-rpath=" (assoc-ref outputs "out")
"/lib/wine64/wine/$(ARCH)-unix")))
#t))
(add-after 'install 'copy-wine32-binaries (add-after 'install 'copy-wine32-binaries
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((wine32 (assoc-ref %build-inputs "wine")) (let* ((wine32 (assoc-ref %build-inputs "wine"))