unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Leo Prikler <leo.prikler@student.tugraz.at>
To: 44761@debbugs.gnu.org
Subject: [bug#44761] [PATCH 2/2] gnu: wine64: Copy wine32 libraries.
Date: Fri, 20 Nov 2020 13:55:48 +0100	[thread overview]
Message-ID: <20201120125547.24681-2-leo.prikler@student.tugraz.at> (raw)
In-Reply-To: <20201120125547.24681-1-leo.prikler@student.tugraz.at>

Fixes the linkage of binaries copied over from wine32.  See also #42342.

* gnu/packages/wine.scm (wine64)[#:phases]: Add copy-wine32-libraries.
---
 gnu/packages/wine.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 7b72fb3c28..492eea0587 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -267,6 +267,13 @@ integrate Windows applications into your desktop.")
                (copy-file (string-append wine32 "/bin/.wine-preloader-real")
                           (string-append out "/bin/wine-preloader"))
                #t)))
+         (add-after 'install 'copy-wine32-libraries
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((wine32 (assoc-ref %build-inputs "wine"))
+                    (out (assoc-ref %outputs "out")))
+               (copy-recursively (string-append wine32 "/lib/wine32")
+                                 (string-append out "/lib/wine32"))
+               #t)))
          (add-after 'compress-documentation 'copy-wine32-manpage
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((wine32 (assoc-ref %build-inputs "wine"))
-- 
2.29.2





  reply	other threads:[~2020-11-20 12:57 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-20 12:54 [bug#44761] PATCH [0/2] Update wine to 5.21 Leo Prikler
2020-11-20 12:55 ` [bug#44761] [PATCH 1/2] gnu: wine: Update " Leo Prikler
2020-11-20 12:55   ` Leo Prikler [this message]
2020-11-28 14:40 ` bug#44761: PATCH [0/2] Update wine " Christopher Baines

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201120125547.24681-2-leo.prikler@student.tugraz.at \
    --to=leo.prikler@student.tugraz.at \
    --cc=44761@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).