From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id GIKoA/YU1GPQsQAAbAwnHQ (envelope-from ) for ; Fri, 27 Jan 2023 19:16:22 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id uKi5A/YU1GPZVwEA9RJhRA (envelope-from ) for ; Fri, 27 Jan 2023 19:16:22 +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 ABE3ED0FF for ; Fri, 27 Jan 2023 19:16:21 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLTGg-0007de-MA; Fri, 27 Jan 2023 13:16:06 -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 1pLTGc-0007dL-De for guix-patches@gnu.org; Fri, 27 Jan 2023 13:16:03 -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 1pLTGc-0003JU-6A for guix-patches@gnu.org; Fri, 27 Jan 2023 13:16:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pLTGb-0002bh-Mp for guix-patches@gnu.org; Fri, 27 Jan 2023 13:16:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61067] [PATCH v2 3/5] gnu: wine-minimal: Share phases with parent wine package. Resent-From: Kaelyn Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Jan 2023 18:16:01 +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: Liliana Marie Prikler Cc: 61067@debbugs.gnu.org Received: via spool by 61067-submit@debbugs.gnu.org id=B61067.167484334810001 (code B ref 61067); Fri, 27 Jan 2023 18:16:01 +0000 Received: (at 61067) by debbugs.gnu.org; 27 Jan 2023 18:15:48 +0000 Received: from localhost ([127.0.0.1]:38425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLTGO-0002bF-DK for submit@debbugs.gnu.org; Fri, 27 Jan 2023 13:15:48 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:21491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLTGI-0002ax-Ii for 61067@debbugs.gnu.org; Fri, 27 Jan 2023 13:15:46 -0500 Date: Fri, 27 Jan 2023 18:15:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674843335; x=1675102535; bh=kpq4BUEOaTRa57OnXtu8QVVCGlc7/wbjOQUlqmo/ZPY=; 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=H6Mt+of5KpHjv/P88Bdgq3KebBNbNzUH2iWUIb4sHhkVF5c3lWBLciL5LdNqHLWck tFdJWttdW6XX1mA4zVyOhpd1hnC5+2/kgfcRXcJXQD8zVOAaGAxcwdixSFusW+g1j3 NPKdx30bREXfrZ/Uln3CpRlSjQveaJ/nHWwTwV0ANETL/mDPlEWctmmPC9Ph88EumR 9e+fNSTFTpjkg2sbBYvy/jjQF0bzPCobXruUXBqEPsgfBEOKVoPr4WvQwM7PxEjGKy 3BqcUAEz4LBR0uMjciG8a06Md2zu8d793thKsojYjBB3bcdxLk4WxvveuzzZjxe7+u bOiyW0r8lACAg== Message-ID: In-Reply-To: <69c359a823949ac876bccaefa92323ec4d631da0.camel@gmail.com> References: <8781968f75fffd5c133f52f4d2ee7808e7b543fa.1674781160.git.kaelyn.alexi@protonmail.com> <69c359a823949ac876bccaefa92323ec4d631da0.camel@gmail.com> 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 X-ACL-Warn: , Kaelyn via Guix-patches From: Kaelyn 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-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1674843381; 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=kpq4BUEOaTRa57OnXtu8QVVCGlc7/wbjOQUlqmo/ZPY=; b=RIWQKS/JaqR4JbIMfvvZAWyyvwGRpFWuxBkVsDyOoiiDuvMyaMeTqmjA6HHqYARR22/C9k jlBEbJBeYTZKAEP6FLCWil7s4C11Pq+LW6fQf8m/9wNTkcw9jg31ZxvpxQnnTN/gJeUtXH o4n2xVxBMQK6zAABirYaZWkftTcMc8t30yq7nGNawdmRMKECVR0Ls7GoafB5CokWPkaAnf F8FreTmaYribk4DmmP+SPMa/RKRslAYaWEMSVNzYxyvqo8HW39MVHtNJuSskc3c4RF1dDr pRX3iJSunUYefyqay0FaOkqaq+hw8KVW3UcPWy5luY7FXgfBUueP5IxjBQZGdg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=H6Mt+of5; 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=1674843381; a=rsa-sha256; cv=none; b=NNtOGUpv2wUTUBh59EHeaaQ/DqIvNyiug270nXe8eRU15lKkr1POk2nS+RqeIbFuTb+8zL +t8TqUrrmiUU24zfT9et9SNGBF//CnfVG9lMhvzG8K/dESZuAUqaR7gM5QjLBuT2Y8JzFv URI/9OWH89IACjyBnWRkb3M4y7AM7oeQXo7EQNKRENd2iY/lnnughXWsTQ+6cKHuj6o90U HNZmWa2VY2J+clNWFre74ey6b/f7ejkoYb6LC2UoxHXrdCBZ5pO/QuRTXys1u9CaVcmqsn RLtNz1LXY0qfME9FbvTG5cMIlQ1UlG84ekL3DPwLRoYDKD1oVn5Lc6xqX5Yyaw== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=H6Mt+of5; 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-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -2.07 X-Spam-Score: -2.07 X-Migadu-Queue-Id: ABE3ED0FF X-TUID: 2FZ+jNCHNToo ------- Original Message ------- On Friday, January 27th, 2023 at 6:03 PM, Liliana Marie Prikler wrote: >=20 >=20 > Am Freitag, dem 27.01.2023 um 01:08 +0000 schrieb Kaelyn Takata: >=20 > > * gnu/packages/wine.scm (wine-minimal): Share phases with parent wine > > package. > > --- > > gnu/packages/wine.scm | 31 +++++++------------------------ > > 1 file changed, 7 insertions(+), 24 deletions(-) > >=20 > > diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm > > index 6e43494c68..b9a8396b75 100644 > > --- a/gnu/packages/wine.scm > > +++ b/gnu/packages/wine.scm > > @@ -308,30 +308,13 @@ (define-public wine-minimal > > (delete "gettext" "perl" "pkg-config"))) > > (inputs `()) (arguments -` (#:validate-runpath? #f > > - #:phases > > - (modify-phases %standard-phases > > - (add-after 'unpack 'patch-SHELL > > - (lambda _ > > - (substitute* "configure" > > - ;; configure first respects CONFIG_SHELL, clobbers > > SHELL later. > > - (("/bin/sh") > > - (which "bash"))))) > > - (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 "--without-freetype" > > - "--without-x") > > - ,@(strip-keyword-arguments '(#:configure-flags #:phases) > > - (package-arguments wine)))))) > > + (substitute-keyword-arguments (package-arguments wine) > > + ((#:phases phases) > > + #~(modify-phases #$phases > > + (delete 'wrap-executable))) ;; Don't reference Vulkan > > ICD files. > > + ((#:configure-flags _ '()) > > + #~(list "--without-freetype" > > + "--without-x")))))) > >=20 > > (define-public wine-staging-patchset-data > > (package > > -- >=20 > Doing it this way is actually dangerous, because changes in wine get > propagated to wine-minimal even if they don't affect it (we had a > similar error in emacs blowing up the size of emacs-minimal recently). > There are two possible solutions: Bind the common phases to a variable > and use that instead of %standard-phases, or make wine inherit wine- > minimal. I'm not sure I'll be able to work on this today, but I am fine with either = approach. I suspect flipping the packages so that wine depends on wine-mini= mal and adds inputs and extra phases and replaces the configure flags will = be simpler from a maintenance perspective since it would keep the wine and = wine-minimal versions in sync automatically. >From the comment in wine.scm, the wine-minimal package is only needed for b= uilding vkd3d to avoid a dependency loop between wine and vkd3d. (A comment= on that package suggests it's the widl tool needed from wine, but wine-min= imal is also an input instead of a native-input so maybe a bit more than a = build-time tool is needed?) Cheers, Kaelyn >=20 > Side note: QA failed :( >=20 > Cheers