From patchwork Fri Jan 27 01:08:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 46435 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 A219C27BBED; Fri, 27 Jan 2023 01:09:51 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BC1D527BBE9 for ; Fri, 27 Jan 2023 01:09:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLDEn-0008Ee-DD; Thu, 26 Jan 2023 20:09:05 -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 1pLDEl-0008Df-Ot for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09: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 1pLDEl-0006ZK-Aj for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pLDEl-0003k4-4q for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09:03 -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 Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Jan 2023 01:09:03 +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 Received: via spool by 61067-submit@debbugs.gnu.org id=B61067.167478172114308 (code B ref 61067); Fri, 27 Jan 2023 01:09:03 +0000 Received: (at 61067) by debbugs.gnu.org; 27 Jan 2023 01:08:41 +0000 Received: from localhost ([127.0.0.1]:36466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEP-0003ii-0e for submit@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:41 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:62467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEN-0003iI-7s for 61067@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:39 -0500 Date: Fri, 27 Jan 2023 01:08:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674781712; x=1675040912; bh=wMjzQnbl7T1j8J3ZaIX3bA7xh62hrZlVAGWkuhfEWAI=; 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=s6ZTmzeVOOOWzPIYbVw4klz5RgpuaiyV7/k7lyINS5D2baPjVONxJ8SuncPQ3jT7Z N/Be60adxmohHTC12DskreZPxFUockgbD6+3ZoyC9UA2upDJlo4ny7ZsA57Nv65pcT bELeOxcIIUa7vvZUHwzKkUn+C3K+5B5KAj+UJZg6PY4749Ea1YKM3WQ8n5UaMpV5vu v4Xe1MotISZl30yPPN0wwKh3GDGmwiyzi1qkke7xJAbFiVc99aPCU72ibruDinPA2J nwZprVmenzyQWrciovbzZ01mv3XqjQoz1d+0sPWGA4f+a7aH7VdfCPDv7EiwxFuUpO sYR7KPMNm0TIQ== Message-ID: <8781968f75fffd5c133f52f4d2ee7808e7b543fa.1674781160.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 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 X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/wine.scm (wine-minimal): Share phases with parent wine package. --- gnu/packages/wine.scm | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) -- 2.39.1 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")))))) (define-public wine-staging-patchset-data (package