From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 2DbZA0Mq3GMI/QAAbAwnHQ (envelope-from ) for ; Thu, 02 Feb 2023 22:25:23 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id +A7DA0Mq3GMuNAAA9RJhRA (envelope-from ) for ; Thu, 02 Feb 2023 22:25:23 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BD33320405 for ; Thu, 2 Feb 2023 22:25:22 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNh4p-0007qJ-Ix; Thu, 02 Feb 2023 16:25:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNh4o-0007q1-JT for guix-patches@gnu.org; Thu, 02 Feb 2023 16:25:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNh4o-0006md-A1 for guix-patches@gnu.org; Thu, 02 Feb 2023 16:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNh4o-0003hk-5c for guix-patches@gnu.org; Thu, 02 Feb 2023 16:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61067] [PATCH v3 4/5] gnu: wine64: Share phases with parent wine package. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Feb 2023 21:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61067 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61067@debbugs.gnu.org Cc: Kaelyn Takata , liliana.prikler@gmail.com Received: via spool by 61067-submit@debbugs.gnu.org id=B61067.167537306014151 (code B ref 61067); Thu, 02 Feb 2023 21:25:02 +0000 Received: (at 61067) by debbugs.gnu.org; 2 Feb 2023 21:24:20 +0000 Received: from localhost ([127.0.0.1]:36010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNh47-0003g6-Ry for submit@debbugs.gnu.org; Thu, 02 Feb 2023 16:24:20 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:18713) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNh45-0003fj-Vq for 61067@debbugs.gnu.org; Thu, 02 Feb 2023 16:24:18 -0500 Date: Thu, 02 Feb 2023 21:24:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1675373052; x=1675632252; bh=OaGkvkZ2PPaKs51UC/iUkUg/xxO81TWZATYK6E9qRmo=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=y1u+w6biVUUEbLsWAiBw5KuQjPyieCi6aVbrKRcfn5D3XC9GivXnPxQxu6c0rJfzz ozjfZpALGvd4s7XYid/lvw5piWiK335N4wEIHHsBzHFF/7MO77e7cA1QqZ6LlS+Myn /j7wkGV+v/vxMOec1fvldErvMOwUW/MUVB5lNGoJHieOBT+Ein4IQR9KfZrAAm2Vbb iTbZawAyvwfIMSOgkHxgTHQoy1USQq7Hht3NTm1QUqOx6UP2AF8yQ/1GHLw/wzLHjy xW8ST1yJBILmhpP9bl2u+eAxagypHihETdVGTD6udm91YDv+e+NM9z5xKm29UJ+eYB cQs5N6p9+a9eA== Message-ID: <221fdb108116f5e6c18b804a94a9b2f22ee2b14d.1675372737.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches From: Kaelyn Takata via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1675373122; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=OaGkvkZ2PPaKs51UC/iUkUg/xxO81TWZATYK6E9qRmo=; b=dGqzvgUoZkIG8bQHwMXPu68ERgl1gXXsMAm/ND12RFEsf+OkgcRFQUkF5pk4KGBNUtrgZ9 hNYccpu8dXdUk79ndVeBUNrcMAsWZYU0FVQN1eZo3XAbNFDcPY77lAQmfSJq808z/XRW8K 8qZsecGRTaypVP35WVnmjiNCa+CrQ24rC0yFlEbjnDfhsqZBwnG5rVL7DKlC4S75RXigZv K6Ao2BtWJi64eBPN27kpAnkFCgcHMrtSvs/BhcsuUX1hbEk7o4QODYoEtWmB73QW/vAN1R MtiP+qH3MTo9JPgk3WrpZRARBnMHp2SpMNeYeVTqGVI22YRxtfBOb4ELgyXWkw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=y1u+w6bi; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1675373122; a=rsa-sha256; cv=none; b=TAMu9ARzZXbFo7eRisHA0THJVOynfSSBlLW49A8Xh7ThaY+ATVXnqCDfbz1DpUd9PHH5ZZ PYCgHvOqgKNHVV2GgBZ/z4hqWIroSliKN+eT1opxaFlshoNkZNlLYOgXxAT5BYOo/hnac0 0kLGAzLkdqz/r5TIaruvnjJ9EAN+NJVLsG31QIGm3SLuwzH8xKPg5ZwOFuEZ0663bredES Ss23PUihGYDco1Fs7H+wOMlOUuZm45A6WEXwkJioJwIURu261vyKsLsnSUmW6OSXW4gh1t UD7cnCzK80CJ5EU/tbpH0kkKCEodUABRz8qX4Nd1u7IJERr0QPsj3vGXAWLNxA== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=y1u+w6bi; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.08 X-Spam-Score: -2.08 X-Migadu-Queue-Id: BD33320405 X-TUID: xkztOsj7XX3k * gnu/packages/wine.scm (wine64): Share phases with parent wine package. --- gnu/packages/wine.scm | 134 ++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 78 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index ceef09ea5d..3b637f76e5 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -236,84 +236,62 @@ (define-public wine64 (inputs (modify-inputs (package-inputs wine) (prepend wine))) (arguments - (cons* - #:make-flags - #~(list "SHELL=3Dbash" - (string-append "libdir=3D" #$output "/lib/wine64")) - #:phases - #~(modify-phases %standard-phases - ;; 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. - #$@(match (%current-system) - ((or "x86_64-linux") - `((add-after 'copy-wine32-binaries 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (icd-files (map - (lambda (basename) - (search-input-file - inputs - (string-append "/share/vulkan/= icd.d/" - basename))) - '("radeon_icd.x86_64.json" - "intel_icd.x86_64.json" - "radeon_icd.i686.json" - "intel_icd.i686.json")))) - (wrap-program (string-append out "/bin/wine-preloa= der") - `("VK_ICD_FILENAMES" ":" =3D ,icd-files)) - (wrap-program (string-append out "/bin/wine64-prel= oader") - `("VK_ICD_FILENAMES" ":" =3D ,icd-files))))))) - (_ - `())) - (add-after 'unpack 'patch-SHELL - (lambda _ - (substitute* "configure" - ;; configure first respects CONFIG_SHELL, clobbers SHELL l= ater. - (("/bin/sh") - (which "bash"))))) - (add-after 'patch-generated-file-shebangs 'patch-makedep - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "tools/makedep.c" - (("output_filenames\\( unix_libs \\);" all) - (string-append all - "output ( \" -Wl,-rpath=3D%s \", arch_inst= all_dirs[arch] );"))))) - (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 wrap= ped - ;; 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/win= e32") - (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")= )))) - (add-after 'configure 'patch-dlopen-paths - ;; Hardcode dlopened sonames to absolute paths. - (lambda _ - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-so (lambda (soname) - (search-path library-path soname)))) - (substitute* "include/config.h" - (("(#define SONAME_.* )\"(.*)\"" _ defso soname) - (format #f "~a\"~a\"" defso (find-so soname)))))))) - #:configure-flags - #~(list "--enable-win64") - (strip-keyword-arguments '(#:configure-flags #:make-flags #:phases - #:system) - (package-arguments wine)))) + (substitute-keyword-arguments + (strip-keyword-arguments '(#:system) (package-arguments wine)) + ((#:make-flags _) + #~(list "SHELL=3Dbash" + (string-append "libdir=3D" #$output "/lib/wine64")) + ) + ((#:phases phases) + #~(modify-phases #$phases + ;; Explicitly set both the 64-bit and 32-bit versions of vulka= n-loader + ;; when installing to x86_64-linux so both are available. + ;; TODO: Add more JSON files as they become available in Mesa. + #$@(match (%current-system) + ((or "x86_64-linux") + `((delete 'wrap-executable) + (add-after 'copy-wine32-binaries 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (icd-files (map + (lambda (basename) + (search-input-file + inputs + (string-append "/share/vulka= n/icd.d/" + basename))) + '("radeon_icd.x86_64.json" + "intel_icd.x86_64.json" + "radeon_icd.i686.json" + "intel_icd.i686.json")))) + (wrap-program (string-append out "/bin/wine-prel= oader") + `("VK_ICD_FILENAMES" ":" =3D ,icd-files)) + (wrap-program (string-append out "/bin/wine64-pr= eloader") + `("VK_ICD_FILENAMES" ":" =3D ,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 wr= apped + ;; version. + (copy-file (search-input-file inputs "/bin/.wine-preload= er-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/w= ine32") + (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 wi= ne. + (copy-file (search-input-file inputs "/share/man/man1/wi= ne.1.gz") + (string-append out "/share/man/man1/wine.1.gz= "))))))) + ((#:configure-flags configure-flags '()) + #~(cons "--enable-win64" #$configure-flags)))) (synopsis "Implementation of the Windows API (WoW64 version)") (supported-systems '("x86_64-linux" "aarch64-linux")))) -- 2.39.1