me/guix
Archived
1
0
Fork 0
Code Activity

gnu: wine: Update to 8.0.

Browse source 
* gnu/packages/wine.scm (wine,wine64,wine-minimal): Update to 8.0.
[arguments]: Remove superfluous rpath setting in configure-flags.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This commit is contained in:
Kaelyn Takata 2023-02-02 21:23:34 +00:00 • committed by Liliana Marie Prikler
parent 2c3d1cdfcc
commit c7c97ac6a3
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/wine.scm
View file

@ -7,6 +7,7 @@
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com>
;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -76,7 +77,7 @@
(define-public wine (define-public wine
(package (package
(name "wine") (name "wine")
(version "7.19") (version "8.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -88,7 +89,7 @@
(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 "08cxigkd83as6gkqgiwdpvr7cyy5ajsnhan3jbadwzqxdrz4kb23")))) (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list bison flex gettext-minimal perl pkg-config)) (list bison flex gettext-minimal perl pkg-config))
@ -142,9 +143,6 @@
;; pass. ;; pass.
#:tests? #f #:tests? #f
#:configure-flags
#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib/wine32"))
#:make-flags #:make-flags
#~(list "SHELL=bash" #~(list "SHELL=bash"
(string-append "libdir=" #$output "/lib/wine32")) (string-append "libdir=" #$output "/lib/wine32"))
@ -197,7 +195,7 @@
(substitute* "tools/makedep.c" (substitute* "tools/makedep.c"
(("output_filenames\\( unix_libs \\);" all) (("output_filenames\\( unix_libs \\);" all)
(string-append all (string-append all
"output ( \" -Wl,-rpath=%s \", so_dir );")))))))) "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );"))))))))
(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
@ -260,7 +258,7 @@ integrate Windows applications into your desktop.")
(substitute* "tools/makedep.c" (substitute* "tools/makedep.c"
(("output_filenames\\( unix_libs \\);" all) (("output_filenames\\( unix_libs \\);" all)
(string-append all (string-append all
"output ( \" -Wl,-rpath=%s \", so_dir );"))))) "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );")))))
(add-after 'install 'copy-wine32-binaries (add-after 'install 'copy-wine32-binaries
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref %outputs "out"))) (let ((out (assoc-ref %outputs "out")))
@ -293,8 +291,7 @@ integrate Windows applications into your desktop.")
(("(#define SONAME_.* )\"(.*)\"" _ defso soname) (("(#define SONAME_.* )\"(.*)\"" _ defso soname)
(format #f "~a\"~a\"" defso (find-so soname)))))))) (format #f "~a\"~a\"" defso (find-so soname))))))))
#:configure-flags #:configure-flags
#~(list "--enable-win64" #~(list "--enable-win64")
(string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib/wine64"))
(strip-keyword-arguments '(#:configure-flags #:make-flags #:phases (strip-keyword-arguments '(#:configure-flags #:make-flags #:phases
#:system) #:system)
(package-arguments wine)))) (package-arguments wine))))