From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id gNbBKADXb2cD2QAAqHPOHw:P1 (envelope-from ) for ; Sat, 28 Dec 2024 10:46:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id gNbBKADXb2cD2QAAqHPOHw (envelope-from ) for ; Sat, 28 Dec 2024 11:46:24 +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=IRA0fk75; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="fI/MqS7A"; 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=1735382784; 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=My7d2D7Ca0FyWnvhdKUXpAHVZfMp73kAYzdO+wHvSaD5G6TuClu9/XHr/Afpz4aTXI3P6B YnwMjyULEkPPRHGvejGeOB5mXFLJsudknlCZ7bGVWsFfMoo7pPWJBVQfV3DqzfHs0DXVvE iWvV6PEERJl/zwUxmktR04g+axW67z5sOUKAWCPWDe18DGPLASQ5KyN1c1BTkE/UemHnHb IUa+mMqBTZ6vzhjRqX021MBw2567wBGwLfBFaXib7sp3M1zKum6Uq7ca7LB7G9q7ZqGFy3 Yu1mtuG/1XueDgO/iIIsK3zpVaSbQeckY+IquMxEyJbioE7hqUuLlSQUy2TbCQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=IRA0fk75; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="fI/MqS7A"; 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=1735382784; a=rsa-sha256; cv=none; b=FYLa4BHmBI0Ov52m6wGBX1jQ2ORg9wD9NZMRHIZ5X093ksplaSxHB+c6eyvpD765bp7U++ 7zxXfgplYO9HrxWuEJJaQdfrR9sluufSzRwU6dcD9N5BHDSDM3eP8U0MFmJpTv3TvPccfm 8xsN/EldIcj+5l6apBNsdWkn6BZCC8Ld9+QG0XiQc3jfFONO+7tpahSsXdHo7gMFzsXHQr vVzux+4MqNCacA5qKAVcoezL9uZbbMzmHnOyrROSu8tKo76g3qcGfUyCnqfTv6/MRw0hgd 3Zq1L8+WUj3eM5MB5aiMKiEgUh0EYr1bUnxlrmyEvsY9oDB2A+TocbKI74R/Tg== 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 60439879EB for ; Sat, 28 Dec 2024 11:46:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRUKb-0000L6-RL; Sat, 28 Dec 2024 05:46: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 1tRUKY-0000Gg-LH for guix-patches@gnu.org; Sat, 28 Dec 2024 05:46: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 1tRUKY-0008RN-Cv for guix-patches@gnu.org; Sat, 28 Dec 2024 05:46: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:Date:From:To:In-Reply-To:References:Subject; bh=VolvP0n4hQd0yPvzjPzhc/5tHm8nNINEE7L0j+AkbTw=; b=IRA0fk75xrv+vSAk21hs83uEc+cxuNbly0SQTzLSeefDRgbbKRiEXByn6S8a9JKMAO4GyjXUU6PpWO4hRSKe7qJsO3IBhZszG/zBi7YuJNrzq03OVnDJF5lTN57DuDvtLisMKc5RJn7/RXxfZ+F2GnsSNgn6rYvFh+rV9iKfSRrDDovxIJPVJzPPxMVzi00r2IQCJcsFuJteEwjnOyTdan/T3c8dQxLlFoBoB0hdw9ZZd9J4vxfsxyY7uj+RwUbTeO7Zu/Umh8WjoWOh5HK6OOQzpESTk/PHlP6ERMkveof+rTfVzfyfLKhmYUM9gnx9rZ+IXAbPNmsXYPXFsIWMhQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tRUKX-0005Np-Vs for guix-patches@gnu.org; Sat, 28 Dec 2024 05:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75159] [PATCH v0 1/4] guix: qt: add inputs and outputs build variables in qt-build References: <20241228102102.922-1-ashvith@noreply.codeberg.org> In-Reply-To: <20241228102102.922-1-ashvith@noreply.codeberg.org> Resent-From: Ashvith Shetty Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Dec 2024 10:46:01 +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.173538274820674 (code B ref 75159); Sat, 28 Dec 2024 10:46:01 +0000 Received: (at 75159) by debbugs.gnu.org; 28 Dec 2024 10:45:48 +0000 Received: from localhost ([127.0.0.1]:48870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRUKJ-0005NH-6y for submit@debbugs.gnu.org; Sat, 28 Dec 2024 05:45:47 -0500 Received: from mail-pj1-f50.google.com ([209.85.216.50]:57807) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRUKG-0005N5-CP for 75159@debbugs.gnu.org; Sat, 28 Dec 2024 05:45:45 -0500 Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2ee9a780de4so7329093a91.3 for <75159@debbugs.gnu.org>; Sat, 28 Dec 2024 02:45:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735382682; x=1735987482; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=VolvP0n4hQd0yPvzjPzhc/5tHm8nNINEE7L0j+AkbTw=; b=fI/MqS7AUeMXdXOktbrSGaw6fWvIQMrBmg1KnUTMQyk67hTkzqMK5ngf0EKvKtTPdH C7ucJuBcIxgRwoz62lfidGQ+oxwZnKdEZz2mF/92OgJMZ1eKpGwl2/i8d4eU4E4OB4KB WzFdiUmlYSD08+ouB/ufLpBqw5yWtY4Eo/aRTZQal1SABv1s2axufKD3N8tnU7/1C6Fx xUKZbmAn1o7ggKWwYaWpDQTH9/8FO6u5AVlvCoM0/oKjJLRV+z9/NmYGmRwKDPnjaul0 5AyRLCIrJmo4uTJxrQS0VGFuQgU3HM3PwGCzyf6qPXIGzwNgGGfai4fgPsOsGYiR3gdJ gOtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735382682; x=1735987482; h=content-transfer-encoding:mime-version: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=cLFcQ1XsP3dERpm/AcNEuQ47yCgMzhLaEegi55kRxOzAbcPvjfkzGqmiW768LooVdB 8xB4PwJ4383Dv69dm1C42g9QD0P/nIy1CtZ4co9Xr6dRBvDsbOAsQy+CKEGaJ1nOM1Nw 2YF0su5TvDdABZFGozj9ERw8WFCgii2f8Qdo+btFOuDUzIic4J2xClVpFbrQO3xMmREX /K/ypDFWnHYX9H1Em0O1JjhYUGOjxPmjdOZYM6x4YCvJfQ2AcDZn7IHjoikQ9XjsRzyC QWP2nqA7ZclHLbwQx8oi+Sz4nLoCTdezM+onV/5nfRoAvab15T6RBeUNac3j8PH61Wu5 xc4Q== X-Gm-Message-State: AOJu0YznE82XBLZ+DTqB/WLWqpwCj1MB5nBhvOoW6wbdjqhwLPZxhEJo oZP6ggnSgTn2Q7N0RHZiFPtlm68ga9l8OXFOMEOMRiLqYVw4rOm/fZBuw6cO X-Gm-Gg: ASbGncvJ3oBEew0Fyar5Rj9taX4GPs6ZJcffv/FzDDMGWfwXkjdi7BClxso2yK8inKG W7bd6HM3hQuXo2jDIt2cGqy2smHFHtokfp6nzRFeZdpv44B9eYZ+ITObg2XyWC3ZBnrOF+WsgJm kzjf7+D4jNJ1YfgsmQBM++B3M5yDm4gk47cEb1/ZL3zcWztfCowwKerhyyqaIwQQZBSKsWU0D+W DERtfhesoUvD0ZypTwjOOxLyUvXbvqQ5SB1NMhpbumu2L6GqzxXA8j2JF5h9mH4XcAifjJL2xeG ZX8T7REAcA== X-Google-Smtp-Source: AGHT+IGx6shncipW5sovHkMgYMJ3wphQPTMBjfZOBXSYE4ttZtyxjpRg9ofdcyzH/EO0/1HXIQ7u0g== X-Received: by 2002:a17:90a:e18c:b0:2ee:e317:69ab with SMTP id 98e67ed59e1d1-2f452d33b98mr52679934a91.0.1735382682520; Sat, 28 Dec 2024 02:44:42 -0800 (PST) Received: from localhost.localdomain ([2401:4900:8813:846d:3ba6:3078:1833:5938]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-21a267dc09bsm18645425ad.169.2024.12.28.02.44.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Dec 2024 02:44:42 -0800 (PST) From: Ashvith Shetty X-Google-Original-From: Ashvith Shetty Date: Sat, 28 Dec 2024 16:14:03 +0530 Message-ID: <20241228104424.4001-1-ashvith@noreply.codeberg.org> X-Mailer: git-send-email 2.46.0 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-Spam-Score: -3.16 X-Spam-Score: -3.16 X-Migadu-Queue-Id: 60439879EB X-Migadu-Scanner: mx10.migadu.com X-TUID: dXemRLnuwHdI 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