[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/15: gnu: wine: Update to 8.0.
From: |
guix-commits |
Subject: |
07/15: gnu: wine: Update to 8.0. |
Date: |
Sun, 5 Feb 2023 01:08:49 -0500 (EST) |
lilyp pushed a commit to branch master
in repository guix.
commit c7c97ac6a351807fb480f4e260079e27f195db2d
Author: Kaelyn Takata <kaelyn.alexi@protonmail.com>
AuthorDate: Thu Feb 2 21:23:34 2023 +0000
gnu: wine: Update to 8.0.
* 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>
---
gnu/packages/wine.scm | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 6e86add4e3..7ca2ac5bdf 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com>
+;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -76,7 +77,7 @@
(define-public wine
(package
(name "wine")
- (version "7.19")
+ (version "8.0")
(source
(origin
(method url-fetch)
@@ -88,7 +89,7 @@
(string-append "https://dl.winehq.org/wine/source/" dir
"wine-" version ".tar.xz")))
(sha256
- (base32 "08cxigkd83as6gkqgiwdpvr7cyy5ajsnhan3jbadwzqxdrz4kb23"))))
+ (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2"))))
(build-system gnu-build-system)
(native-inputs
(list bison flex gettext-minimal perl pkg-config))
@@ -142,9 +143,6 @@
;; pass.
#:tests? #f
- #:configure-flags
- #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib/wine32"))
-
#:make-flags
#~(list "SHELL=bash"
(string-append "libdir=" #$output "/lib/wine32"))
@@ -197,7 +195,7 @@
(substitute* "tools/makedep.c"
(("output_filenames\\( unix_libs \\);" all)
(string-append all
- "output ( \" -Wl,-rpath=%s \", so_dir
);"))))))))
+ "output ( \" -Wl,-rpath=%s \",
arch_install_dirs[arch] );"))))))))
(home-page "https://www.winehq.org/")
(synopsis "Implementation of the Windows API (32-bit only)")
(description
@@ -260,7 +258,7 @@ integrate Windows applications into your desktop.")
(substitute* "tools/makedep.c"
(("output_filenames\\( unix_libs \\);" all)
(string-append all
- "output ( \" -Wl,-rpath=%s \", so_dir );")))))
+ "output ( \" -Wl,-rpath=%s \",
arch_install_dirs[arch] );")))))
(add-after 'install 'copy-wine32-binaries
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref %outputs "out")))
@@ -293,8 +291,7 @@ integrate Windows applications into your desktop.")
(("(#define SONAME_.* )\"(.*)\"" _ defso soname)
(format #f "~a\"~a\"" defso (find-so soname))))))))
#:configure-flags
- #~(list "--enable-win64"
- (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib/wine64"))
+ #~(list "--enable-win64")
(strip-keyword-arguments '(#:configure-flags #:make-flags #:phases
#:system)
(package-arguments wine))))
- 09/15: gnu: wine-minimal: Make the parent of wine so phases can be shared., (continued)
- 09/15: gnu: wine-minimal: Make the parent of wine so phases can be shared., guix-commits, 2023/02/05
- 11/15: gnu: wine-minimal: Build more reproducibly., guix-commits, 2023/02/05
- 14/15: services: mpd: Do not hardcode environment variables., guix-commits, 2023/02/05
- 03/15: gnu: Rename 'git-minimal/fixed' to 'git-minimal/pinned'., guix-commits, 2023/02/05
- 04/15: gnu: Rename 'libnftnl/fixed' to 'libnftnl/pinned'., guix-commits, 2023/02/05
- 05/15: gnu: Rename 'guile-3.0/fixed' to 'guile-3.0/pinned'., guix-commits, 2023/02/05
- 08/15: gnu: wine-staging: Update to 8.0., guix-commits, 2023/02/05
- 10/15: gnu: wine64: Share phases with parent wine package., guix-commits, 2023/02/05
- 12/15: services: mpd: Rewrite using 'define-configuration'., guix-commits, 2023/02/05
- 13/15: services: mpd: Refactor MPD service., guix-commits, 2023/02/05
- 07/15: gnu: wine: Update to 8.0.,
guix-commits <=
- 15/15: services: Add mympd-service-type., guix-commits, 2023/02/05