From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id iFZJLQUacGdWRAAAqHPOHw:P1 (envelope-from ) for ; Sat, 28 Dec 2024 15:32:21 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id iFZJLQUacGdWRAAAqHPOHw (envelope-from ) for ; Sat, 28 Dec 2024 16:32:21 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=b4lNxGB7; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=ME8Qy98J; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735399941; h=from:from:sender:sender: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=VolvP0n4hQd0yPvzjPzhc/5tHm8nNINEE7L0j+AkbTw=; b=ascjNr46XoBnZJ44WrdPNMiumw+Vw9cfXFqASlCbCIAsFQGFIlMq1WO8Wf8SgIngr8y2d+ AcH3ZnkOUJnQTExgap1kP+yh1QDCqdcvQowQ/pCxNfNyffGdRH0QDRDeMJFkYZwv/CiFwR lgl5DkL7qz0TP7xp5RSBXTC5+UgGbMFTnGB7vD+pcxwdESvYW4YInmng+H+sMuSCX6C0hD d/BxlsyniQ/4pL168KZ8eiR7CFDyJY8C8GeY/pIMsS9mIMQ7PBqL9mi+cs/4thItOrgtiN z8QJxcwzrFFAzkdqx/IuXp4QF5M1F3EcwYFE+iWtJreHeCyAn96TIpt+sEsJng== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=b4lNxGB7; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=ME8Qy98J; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735399941; a=rsa-sha256; cv=none; b=J0/C4cSebvFmHdp5gXX9cYe6P+UGDDhkByPWW27pX5/KfdYIPH7f0XIy6RK3+AfdBkw1vh NdwrUmsqFfvWsh2gqu8PObEE5GEARZlDH/WlKfFFYyIVpoyB7IzVGGU6LhKAAC4Wu6oIRk RyDAi3tE67U/AfWG30Z4DTL7WK9Ar69bPuJM2tpKGc8TcQtU2AnCGCqU55vxGy75K/fajS VZ4fw4c0KRUJu7wCElizup0Y/nxGh8AquVRQGqdyJVD46XM9h+77a2rYtKvuMzpt5UL8zQ t15RhA5SrkFduucT5ngG+ogDmlViJlAJFJ0yuEG+K4m+ofLdJZEijMXsGPznVg== 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 36D1D5D47C for ; Sat, 28 Dec 2024 16:32:21 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRYnM-0001sw-4d; Sat, 28 Dec 2024 10:32: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 1tRYnK-0001sR-Lf for guix-patches@gnu.org; Sat, 28 Dec 2024 10:32:02 -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 1tRYnK-0007Se-Cy for guix-patches@gnu.org; Sat, 28 Dec 2024 10:32: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=VolvP0n4hQd0yPvzjPzhc/5tHm8nNINEE7L0j+AkbTw=; b=b4lNxGB7roizgjOYKIIY+Dcw5+C/mlGGD+AELHsWxGI2ygwLTtf6qd6xnaqU2eW61Mc/9qwhiLUCuff8nehEvngC5yqYklQ5e60WU18pevrsBhRg/SbtqRUXbuHQbp8+aRNLmwSpmn06X2KeZ2NF7PiFIYHDPF0lTl/OUySUy4uuUrjx4YsxrOPUpmXNjGHqp1n+A8hJLboe5xYWFtQbZKEXBgHsjG8WViAGz/HjywZ4OMQXAyfLHzBlI8LcZrO7V9HH4UfZVB/6xuFWst8OD4dqHMOYqdR3113VfDrHBt8QvQhUJ8e9pY/s7ESIZNaSUvL77YUuftX0yPWN7rPGsA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tRYnK-0002vA-7G for guix-patches@gnu.org; Sat, 28 Dec 2024 10:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75159] [PATCH v1 1/5] guix: qt: add inputs and outputs build variables in qt-build Resent-From: Ashvith Shetty Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Dec 2024 15:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75159 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75159@debbugs.gnu.org Cc: Rutherther Received: via spool by 75159-submit@debbugs.gnu.org id=B75159.173539992011213 (code B ref 75159); Sat, 28 Dec 2024 15:32:02 +0000 Received: (at 75159) by debbugs.gnu.org; 28 Dec 2024 15:32:00 +0000 Received: from localhost ([127.0.0.1]:52320 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRYnI-0002un-Cv for submit@debbugs.gnu.org; Sat, 28 Dec 2024 10:32:00 -0500 Received: from mail-pl1-f177.google.com ([209.85.214.177]:52577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRYnF-0002uS-Py for 75159@debbugs.gnu.org; Sat, 28 Dec 2024 10:31:58 -0500 Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-21661be2c2dso90966025ad.1 for <75159@debbugs.gnu.org>; Sat, 28 Dec 2024 07:31:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735399852; x=1736004652; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VolvP0n4hQd0yPvzjPzhc/5tHm8nNINEE7L0j+AkbTw=; b=ME8Qy98JAPvHrpz/mWaFN8zb4xUGxg9JYUpNC8WLjMbRo/b+3qr4YWc7blXSVpPWgH Ohxb+gOpAtDRMuoFTTdWY+YLmnf1bQrN+YO9zX3uml9SZ74okeu108khQkhcaTPFv2jQ SGBxIwLRDTfVk6TQYIxQ8vdSQMmZviGCTI440nGD5FyMgnNMbI8Z5zfNSJnV+9mYh26S d01QQ3fg3r+FzKdTQrCX0N4cSBIY5N9LXvgCVheeuVw3Du9eaWIzlXhzStenjKFUiwTF A7JeA/U/dI/VBIjoC2EhS3s+fIAr6VKcn0qmP7YWYhMBZtEFm1Q9CwaxISgmdSVGaE3p 23Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735399852; x=1736004652; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VolvP0n4hQd0yPvzjPzhc/5tHm8nNINEE7L0j+AkbTw=; b=wSSgyOabFFdV7YExE5gNkglDw8RmIiCkBBL7WARRn/vINxLFLU7WNObHfKLDFz0slc DI7lJjI3yg9iDwTnAKPjCbzJtSvzZnxR5MGm5tsdR64OhXVo7ABL193rsCb1EKL5ZHb0 Z9KnOkGhQ3xlhx3zrtqdqYEftnwsPprgyR4Y4/Al1UN/oN9pbasQipOqfv0VSop0JCoO CDz+zJgUazxYpKaOhyWulmcBf4AbsweIamMkKfKY/xvPpvbeBIxuUQquHwEqIrb8rXr5 KB3QZSfwWINiENaHL+qOc0udrN5xXy8dm2tvlHPvXM9y4KgTIJUavS415q0IWUotNp/V hcKg== X-Gm-Message-State: AOJu0Yz3uI0wbRMLD1X4TqCSRzOeC1eealjW2b1YwNugmK29SXypzMv3 gcAfhlBLfJ1Svj77xbYCSlDn9PYs8lp5NdvIAK2aexFWL6OB9u9b9xmYDcv3 X-Gm-Gg: ASbGnct12c+jIUtxwVNFRMiHkQJ1/LS/JO2p4bFO7y9tMsPIJe9aNSvRWgOkGSMeyCC JDJBKXA1EDDs1zf3dnD/nqvCA8lcVi1VpfRuhRwFTDtBv7mBeFxr4MbN4eAJ/ILAPnOw2V4ykEO GAMeLe4/pk12y5pcLLjIH2r/2KZUbHOeu0dKYE6oA4R4LMvxnY6m2H2e1JOG8Y0tSiFEUu8Zns/ XXOyGDwVmVB8Yiisg2WCAr94KugZxmhOw9pxaYmvV+UYh7K0moaGsVaec9quo+UO9rcVkT09+7t 6jGSfXVfAg== X-Google-Smtp-Source: AGHT+IGUd9gtaoGW4phdI30TD8MIDrPaV2JUNRqA1hV9jsclEuyAG4feM5tr+N68rCyPJYM6hDzLdg== X-Received: by 2002:a17:902:d48f:b0:212:4aec:f646 with SMTP id d9443c01a7336-219e6ec1340mr363396665ad.33.1735399851865; Sat, 28 Dec 2024 07:30:51 -0800 (PST) Received: from localhost.localdomain ([2401:4900:8813:846d:3ba6:3078:1833:5938]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-219dc9629acsm151509825ad.46.2024.12.28.07.30.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Dec 2024 07:30:51 -0800 (PST) From: Ashvith Shetty X-Google-Original-From: Ashvith Shetty Date: Sat, 28 Dec 2024 21:00:03 +0530 Message-ID: <20241228153020.20233-2-ashvith@noreply.codeberg.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241228153020.20233-1-ashvith@noreply.codeberg.org> References: <20241228153020.20233-1-ashvith@noreply.codeberg.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+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-Queue-Id: 36D1D5D47C X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -0.09 X-Spam-Score: -0.09 X-TUID: 1WMyrllPVcgg From: Rutherther 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 builder (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