[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
232/377: gnu: wine: Update to 6.14.
From: |
guix-commits |
Subject: |
232/377: gnu: wine: Update to 6.14. |
Date: |
Sun, 5 Sep 2021 10:07:54 -0400 (EDT) |
raghavgururajan pushed a commit to branch wip-gnome
in repository guix.
commit 07328706313bc52a1ad5842e02bd0c50e5312833
Author: Leo Prikler <leo.prikler@student.tugraz.at>
AuthorDate: Thu Aug 5 21:10:05 2021 +0200
gnu: wine: Update to 6.14.
* gnu/packages/wine.scm (wine): Update to 6.14.
[#:phases]: Patch Makefile to correctly locate ntdll.so.
(wine64)[#:phases]: Likewise.
---
gnu/packages/wine.scm | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 5c6d02e..fccdc18 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -75,7 +75,7 @@
(define-public wine
(package
(name "wine")
- (version "6.8")
+ (version "6.14")
(source
(origin
(method url-fetch)
@@ -87,7 +87,7 @@
(string-append "https://dl.winehq.org/wine/source/" dir
"wine-" version ".tar.xz")))
(sha256
- (base32 "1n7bd6kkhfgi23bz981qml3lajgvbs3ibqrc2mqjhhfqczg2shjv"))))
+ (base32 "00jjqbl0xzsp2swzxgx3a2b16p26qbxvcz82a7ihig23k69p3d34"))))
(build-system gnu-build-system)
(native-inputs
`(("bison" ,bison)
@@ -194,7 +194,16 @@
(substitute* "include/config.h"
(("(#define SONAME_.* )\"(.*)\"" _ defso 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/")
(synopsis "Implementation of the Windows API (32-bit only)")
(description
@@ -254,6 +263,15 @@ integrate Windows applications into your desktop.")
#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
(lambda* (#:key outputs #:allow-other-keys)
(let* ((wine32 (assoc-ref %build-inputs "wine"))
- 214/377: services: base: Honor file-system-create-mount-point? at all times., (continued)
- 214/377: services: base: Honor file-system-create-mount-point? at all times., guix-commits, 2021/09/05
- 216/377: isc-dhcp: Fix dhclient-script wrapper when cross-compiling., guix-commits, 2021/09/05
- 218/377: gnu: Add emacs-hideshowvis., guix-commits, 2021/09/05
- 219/377: gnu: shadow: Use the cross-compiled shell at runtime., guix-commits, 2021/09/05
- 220/377: gnu: mu: Update to 1.6.5., guix-commits, 2021/09/05
- 222/377: gnu: guile-websocket: Update to 0.1-d17878f6., guix-commits, 2021/09/05
- 223/377: services: xorg: Delay the xorg-configuration-modules field evaluation., guix-commits, 2021/09/05
- 224/377: gnu: extra-cmake-modules: Avoid dependency on qtbase when on armhf., guix-commits, 2021/09/05
- 225/377: build: Build (gnu system setuid)., guix-commits, 2021/09/05
- 231/377: gnu: Add ocaml-odoc-parser., guix-commits, 2021/09/05
- 232/377: gnu: wine: Update to 6.14.,
guix-commits <=
- 230/377: build-system: chicken: Add 'egg-uri' procedure., guix-commits, 2021/09/05
- 233/377: gnu: Add h-client., guix-commits, 2021/09/05
- 234/377: gnu: wine: Update to 6.16., guix-commits, 2021/09/05
- 238/377: gnu: Add python-pytest-console-scripts., guix-commits, 2021/09/05
- 241/377: gnu: Add python-anyio., guix-commits, 2021/09/05
- 242/377: gnu: Add python-jupyter-server., guix-commits, 2021/09/05
- 243/377: gnu: python-scanpy: Update to 1.8.1., guix-commits, 2021/09/05
- 244/377: gnu: python-anndata: Fetch sources from git., guix-commits, 2021/09/05
- 245/377: gnu: python-scikit-learn: Update to 0.24.2., guix-commits, 2021/09/05
- 246/377: gnu: Add python-voila., guix-commits, 2021/09/05