From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id EMh1KsWqUGefPQEAqHPOHw:P1 (envelope-from ) for ; Wed, 04 Dec 2024 19:17:25 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id EMh1KsWqUGefPQEAqHPOHw (envelope-from ) for ; Wed, 04 Dec 2024 20:17:25 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=LDMtEgWv; dkim=fail ("headers rsa verify failed") header.d=ditigal.xyz header.s=20240917 header.b=NJGqHkAs; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733339845; 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-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=BHNvrrC2hFtaUPNRp4LdzRqxXDdrdeLEuY2ZPlspdDk=; b=QvI4++UP4ld0m1R/OY5qle7dMqaHo6MgQw2YIHHmxoHA8QTy+4MzfAie8ey9GL6EbqpfrW Tv4ZWnO05riLflWW9Us/cB6Jq55cHCfKNnQXwDLas3W0+uU8B5oUngMGEWIB3DLEdUL8n+ Ll8QUvPSCSuXO2doYx/oWfX/rajMSqIG/HWFatx8XwivECchIRuaLHj2BsjODjn43JdPfn /W9bQKNqhGYLCRjcN5GsQZPOWz+WKLrpIT263t1KoDn+h/A59jdk33bDgH9BjEwi+BKuGW TQ6ioid4w2HyRkurcKWbyIvXcG4Y35exveVx+y0iZEVuRVWVFMeLmaapzjaKyQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=LDMtEgWv; dkim=fail ("headers rsa verify failed") header.d=ditigal.xyz header.s=20240917 header.b=NJGqHkAs; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733339845; a=rsa-sha256; cv=none; b=s4a8bnPwHJ1yGVoT16KAx6vf2BXPFmF5m9r59Lay3eWuwzzgbY6XDNoyokoVOtmdAxW8Kx 8b1rrQdhiaBxPrvTUSHrNeTB4Nau7XcKnrW3jqWYjqOs4qlfBrCNOJI9r1zyDWse3NSN+Q ZMHUrlUYSzeoMdfTNdBHcHGR5ZTsI4OXuEXcf945gT/P/q0wIAKLH8m9R2QR+G7xqoWhnB ofb0WjczgA0kt5qf+TpKI/1E28Dz9hO+6K4WH9f9L30DETnWdrRJtEbMcBlYDDaVuIM08j t0U7D3ADMW81gODoSVlSfJrD8AIMBk+Mkr2Cp3LV3QDZi4OMXPToe17+gWcKbA== 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 4D59F427C5 for ; Wed, 04 Dec 2024 20:17:25 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIurw-0007eN-Ex; Wed, 04 Dec 2024 14:17:04 -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 1tIurv-0007e1-BZ for guix-patches@gnu.org; Wed, 04 Dec 2024 14:17:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tIuru-0007O7-56 for guix-patches@gnu.org; Wed, 04 Dec 2024 14:17:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=BHNvrrC2hFtaUPNRp4LdzRqxXDdrdeLEuY2ZPlspdDk=; b=LDMtEgWvZPp/i0faYXn2wE9MpSHOBUiRH6FJYV47MVM5SCAIkM2vL68e9aSRIFaZzYv3VIEOfppNaIz5KIWAcuVYZYO+oCegrH+kEb1UMME5vzpdkoQaOIziDDexPe9hEhwtcd7/TOsoj+YvCOuxFqaOQPo61xO7GnwuiQvEzEKbPfEP1a/4guDAeU77VX4DMwGhTyJKYeeRiyacH/B7+WjHy1evLJbQWOi9G5g9PsQWxiAw71vTQGd3MVXrlmuDi+319z32oAd1Qfe8Pj0Ng3JWVwbL6TVyFunKwV7+PgVE7a1QFb9nUQuOz8xZhXPgXV5MrarzC62MTiWeltUifQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tIurt-0002Nr-V5; Wed, 04 Dec 2024 14:17:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74695] [PATCH 1/1] guix: qt: add inputs and outputs build variables in qt-build Resent-From: Rutherther Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 04 Dec 2024 19:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74695 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74695@debbugs.gnu.org Cc: Rutherther , Maxim Cournoyer , =?UTF-8?Q?=C3=A5=C2=AE=C2=8B=C3=A6=C2=96=C2=87=C3=A6=C2=AD=C2=A6?= X-Debbugs-Original-Xcc: Maxim Cournoyer , =?UTF-8?Q?=C3=A5=C2=AE=C2=8B=C3=A6=C2=96=C2=87=C3=A6=C2=AD=C2=A6?= Received: via spool by 74695-submit@debbugs.gnu.org id=B74695.17333397719057 (code B ref 74695); Wed, 04 Dec 2024 19:17:01 +0000 Received: (at 74695) by debbugs.gnu.org; 4 Dec 2024 19:16:11 +0000 Received: from localhost ([127.0.0.1]:36903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIur4-0002M1-LO for submit@debbugs.gnu.org; Wed, 04 Dec 2024 14:16:11 -0500 Received: from ditigal.xyz ([78.46.201.50]:42640 helo=mail.ditigal.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIur3-0002Lk-0q for 74695@debbugs.gnu.org; Wed, 04 Dec 2024 14:16:09 -0500 Received: by cerebrum (OpenSMTPD) with ESMTPSA id 99c60681 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 4 Dec 2024 19:16:01 +0000 (UTC) Date: Wed, 4 Dec 2024 20:15:36 +0100 Message-ID: <5ca3416dfabd3dfd5643a6f656c1d02fa3f37e61.1733339135.git.rutherther@ditigal.xyz> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ditigal.xyz; i=@ditigal.xyz; q=dns/txt; s=20240917; t=1733339761; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=ZLSz8gNRak0o62zakjpxS3jorT/54MFcdQVLnvDjuOY=; b=NJGqHkAskSFI+XdF9iHA+CY62UoDjLU/67JNqX2+1W7Op5G2bdviuhrGOdW5mzTcyIfaw n+vDxF8jNxO6ILvwGZEjA4qpSaBvSXmdlvmVL721fNOIqQ8uDkrfXte/w9I0lmO/4+zZCv7 0bflosK8OuHdXIX7XQPl5j3Hd/kAzos= 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: Rutherther X-ACL-Warn: , Rutherther via Guix-patches From: Rutherther 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 X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: 1.85 X-Spam-Score: 1.85 X-Migadu-Queue-Id: 4D59F427C5 X-TUID: rdASciil80AA Qt build doesn't provide build-variables of inputs and outputs, so it's not possible to refer to %outputs in arguments of a package that uses qt-build-system. This patch unifies qt-build-system's behavior with other build systems like cmake-build-system or gnu-build-system. * guix/build-system/qt.scm (qt-build): Wrap with with-build-variables to provide variables to arguments Change-Id: I65853a5831ce7b5dc7ebe10807c6e61bb89cab36 --- guix/build-system/qt.scm | 54 +++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index d1f721c54e..5f9a5019ae 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -152,32 +152,34 @@ (define* (qt-build name inputs (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) - (qt-build #:source #+source - #:system #$system - #:outputs #$(outputs->gexp outputs) - #:inputs #$(input-tuples->gexp inputs) - #:search-paths '#$(sexp->gexp - (map search-path-specification->sexp - search-paths)) - #:phases #$(if (pair? phases) - (sexp->gexp phases) - phases) - #:qtbase #+qtbase - #:qt-wrap-excluded-outputs #$qt-wrap-excluded-outputs - #:qt-wrap-excluded-inputs #$qt-wrap-excluded-inputs - #:configure-flags #$configure-flags - #:make-flags #$make-flags - #:out-of-source? #$out-of-source? - #:build-type #$build-type - #:tests? #$tests? - #:test-target #$test-target - #:parallel-build? #$parallel-build? - #:parallel-tests? #$parallel-tests? - #:validate-runpath? #$validate-runpath? - #:patch-shebangs? #$patch-shebangs? - #:strip-binaries? #$strip-binaries? - #:strip-flags #$strip-flags - #:strip-directories #$strip-directories)))) + + #$(with-build-variables inputs outputs + #~(qt-build #:source #+source + #:system #$system + #:outputs %outputs + #:inputs %build-inputs + #:search-paths '#$(sexp->gexp + (map search-path-specification->sexp + search-paths)) + #:phases #$(if (pair? phases) + (sexp->gexp phases) + phases) + #:qtbase #+qtbase + #:qt-wrap-excluded-outputs #$qt-wrap-excluded-outputs + #:qt-wrap-excluded-inputs #$qt-wrap-excluded-inputs + #:configure-flags #$configure-flags + #:make-flags #$make-flags + #:out-of-source? #$out-of-source? + #:build-type #$build-type + #:tests? #$tests? + #:test-target #$test-target + #:parallel-build? #$parallel-build? + #:parallel-tests? #$parallel-tests? + #:validate-runpath? #$validate-runpath? + #:patch-shebangs? #$patch-shebangs? + #:strip-binaries? #$strip-binaries? + #:strip-flags #$strip-flags + #:strip-directories #$strip-directories))))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) system #:graft? #f))) -- 2.46.0