GNU bug report logs - #72922
[PATCH] gnu: wine64: Fix build.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 72922 in the body.
You can then email your comments to 72922 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: wine64: Fix build.
Date: Sat, 31 Aug 2024 21:09:30 +0200

With the core-updates merge, the handling of modify-phases makes the current
ordering a hard error.  Make it so that phases are read from top to bottom.

* gnu/packages/wine.scm (wine64)[#:phases]: Move ‘copy-wine32-binaries’
and ‘copy-wine32-libraries’ before conditional ‘wrap-executable’.
<copy-wine32-manpage>: Use “.zst” instead of “.gz” as file ending.
---
 gnu/packages/wine.scm | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 35520ee03b..0e1195b6ed 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -256,6 +256,21 @@ (define-public wine64
         )
        ((#:phases phases)
         #~(modify-phases #$phases
+            (add-after 'install 'copy-wine32-binaries
+              (lambda* (#:key inputs outputs #:allow-other-keys)
+                (let ((out (assoc-ref %outputs "out")))
+                  ;; Copy the 32-bit binaries needed for WoW64.
+                  (copy-file (search-input-file inputs "/bin/wine")
+                             (string-append out "/bin/wine"))
+                  ;; Copy the real 32-bit wine-preloader instead of the wrapped
+                  ;; version.
+                  (copy-file (search-input-file inputs "/bin/.wine-preloader-real")
+                             (string-append out "/bin/wine-preloader")))))
+            (add-after 'install 'copy-wine32-libraries
+              (lambda* (#:key inputs outputs #:allow-other-keys)
+                (let* ((out (assoc-ref %outputs "out")))
+                  (copy-recursively (search-input-directory inputs "/lib/wine32")
+                                    (string-append out "/lib/wine32")))))
             ;; Explicitly set both the 64-bit and 32-bit versions of vulkan-loader
             ;; when installing to x86_64-linux so both are available.
             ;; TODO: Add more JSON files as they become available in Mesa.
@@ -281,27 +296,12 @@ (define-public wine64
                             `("VK_ICD_FILENAMES" ":" = ,icd-files)))))))
                  (_
                   `()))
-            (add-after 'install 'copy-wine32-binaries
-              (lambda* (#:key inputs outputs #:allow-other-keys)
-                (let ((out (assoc-ref %outputs "out")))
-                  ;; Copy the 32-bit binaries needed for WoW64.
-                  (copy-file (search-input-file inputs "/bin/wine")
-                             (string-append out "/bin/wine"))
-                  ;; Copy the real 32-bit wine-preloader instead of the wrapped
-                  ;; version.
-                  (copy-file (search-input-file inputs "/bin/.wine-preloader-real")
-                             (string-append out "/bin/wine-preloader")))))
-            (add-after 'install 'copy-wine32-libraries
-              (lambda* (#:key inputs outputs #:allow-other-keys)
-                (let* ((out (assoc-ref %outputs "out")))
-                  (copy-recursively (search-input-directory inputs "/lib/wine32")
-                                    (string-append out "/lib/wine32")))))
             (add-after 'compress-documentation 'copy-wine32-manpage
               (lambda* (#:key inputs outputs #:allow-other-keys)
                 (let* ((out (assoc-ref %outputs "out")))
                   ;; Copy the missing man file for the wine binary from wine.
-                  (copy-file (search-input-file inputs "/share/man/man1/wine.1.gz")
-                             (string-append out "/share/man/man1/wine.1.gz")))))))
+                  (copy-file (search-input-file inputs "/share/man/man1/wine.1.zst")
+                             (string-append out "/share/man/man1/wine.1.zst")))))))
        ((#:configure-flags configure-flags '())
         #~(cons "--enable-win64" #$configure-flags))))
     (synopsis "Implementation of the Windows API (WoW64 version)")

base-commit: 19e0b937857563e77841a4fc5433589fa98c810d
-- 
2.45.2

Message #8 received at 72922 <at> debbugs.gnu.org (full text, mbox):

From: Ian Eure <ian <at> retrospec.tv>
To: 72922 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: wine64: Fix build.
Date: Sun, 01 Sep 2024 09:28:54 -0700

This looks good to me.

Thanks,

 — Ian

Message #11 received at 72922 <at> debbugs.gnu.org (full text, mbox):

From: "Dr. Arne Babenhauserheide" <arne_bab <at> web.de>
To: 72922 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: wine64: Fix build.
Date: Mon, 02 Sep 2024 21:37:32 +0200

[Message part 1 (text/plain, inline)]

Tested — this works for me.

Thank you!

Best wishes,
Arne
-- 
Unpolitisch sein
heißt politisch sein,
ohne es zu merken.
draketo.de

[signature.asc (application/pgp-signature, inline)]

Message #16 received at 72922-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 72922-done <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: wine64: Fix build.
Date: Sun, 08 Sep 2024 16:03:07 +0200

Am Samstag, dem 31.08.2024 um 21:09 +0200 schrieb Liliana Marie
Prikler:
> With the core-updates merge, the handling of modify-phases makes the
> current ordering a hard error.  Make it so that phases are read from
> top to bottom.
> 
> * gnu/packages/wine.scm (wine64)[#:phases]: Move ‘copy-wine32-
> binaries’ and ‘copy-wine32-libraries’ before conditional ‘wrap-
> executable’.
> <copy-wine32-manpage>: Use “.zst” instead of “.gz” as file ending.
> ---
Pushed some while ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.