From patchwork Fri Nov 20 12:55:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 25200 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1E39327BBF6; Fri, 20 Nov 2020 12:57:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9E10027BBF5 for ; Fri, 20 Nov 2020 12:57:10 +0000 (GMT) Received: from localhost ([::1]:56964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kg5yP-00046p-RD for patchwork@mira.cbaines.net; Fri, 20 Nov 2020 07:57:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kg5yI-00042s-MH for guix-patches@gnu.org; Fri, 20 Nov 2020 07:57:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58934) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kg5yI-0005PL-F3 for guix-patches@gnu.org; Fri, 20 Nov 2020 07:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kg5yI-0002Wj-E7 for guix-patches@gnu.org; Fri, 20 Nov 2020 07:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44761] [PATCH 2/2] gnu: wine64: Copy wine32 libraries. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Nov 2020 12:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44761 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 44761@debbugs.gnu.org Received: via spool by 44761-submit@debbugs.gnu.org id=B44761.16058769779653 (code B ref 44761); Fri, 20 Nov 2020 12:57:02 +0000 Received: (at 44761) by debbugs.gnu.org; 20 Nov 2020 12:56:17 +0000 Received: from localhost ([127.0.0.1]:42246 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kg5xZ-0002Vd-2G for submit@debbugs.gnu.org; Fri, 20 Nov 2020 07:56:17 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:48368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kg5xV-0002VM-DB for 44761@debbugs.gnu.org; Fri, 20 Nov 2020 07:56:13 -0500 Received: from localhost.localdomain (217-149-162-128.nat.highway.telekom.at [217.149.162.128]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4CcxPQ5xr7z1LWpG for <44761@debbugs.gnu.org>; Fri, 20 Nov 2020 13:56:10 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4CcxPQ5xr7z1LWpG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1605876970; bh=7ByhvfTVZrnavp/H0VcmPeBJSz22Q4+zD+kJalHOYew=; h=From:To:Subject:Date:In-Reply-To:References:From; b=KzWr12wL8OXzGj8bINyDjlB3PkWbhKBabDM38f+OrYxsVXrwMf1tmk2vTOKsrLtX3 3EvzlkszqSMsxl2gJxFuIZaOTYVodXaicSXQ93NPyrHKoaHeDlVw9+Mf8rNZ0J7dZo h/WQTpI0+AaN80uq03Xm8+IUTnw5RuW14VRb3kdw= From: Leo Prikler Date: Fri, 20 Nov 2020 13:55:48 +0100 Message-Id: <20201120125547.24681-2-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201120125547.24681-1-leo.prikler@student.tugraz.at> References: <20201120125547.24681-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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"))