From unknown Sat Aug 16 22:47:18 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#61180] [PATCH] build-system: Always pass #:graft? #f to 'gexp->derivation'. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: 60947@debbugs.gnu.org, guix-patches@gnu.org Resent-Date: Mon, 30 Jan 2023 16:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61180 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61180@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , 60947@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: 60947@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167509490632515 (code B ref -1); Mon, 30 Jan 2023 16:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Jan 2023 16:08:26 +0000 Received: from localhost ([127.0.0.1]:50184 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMWhl-0008SM-Rh for submit@debbugs.gnu.org; Mon, 30 Jan 2023 11:08:26 -0500 Received: from lists.gnu.org ([209.51.188.17]:42132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMWhk-0008SD-7Y for submit@debbugs.gnu.org; Mon, 30 Jan 2023 11:08:24 -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 1pMWhk-0004JI-1Z for guix-patches@gnu.org; Mon, 30 Jan 2023 11:08:24 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMWhj-0005aW-CO; Mon, 30 Jan 2023 11:08:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=BiN/L2lEbzgrjV147QmDXp8Y07TwyxGdkMne5pBsGIE=; b=VcLzjW1KVLrqQFubfZZM nOHYxgts3xhLNpiAAeIF81mywxbkR/OGttxzpOzfV96+NQ8e/Yw8inbqmF/P/SdGhVZge78Yl0bHp TsL9I3h99hPZ2z0lIatozTLf3PK0G48m7TJxVm2bvkQGdpBY+A82kZ1VSIpJ99dHRarmdUeoeQqDQ 3G7xgfdf4IULHNOnTO54avAeARoe6EbDwF892Ie6MkhQTuNjgVfwI4vXNQCbzfNirJ1vO/DcegoWr +fK9muST9IUd8eci5E28TM6AuICOW8kcCdi9Xhh3rYk2/9D5jLrELv/s2oA4GSduehO/HTqJk5mHI ebibWke+2uQQhg==; Received: from [193.50.110.131] (helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pMWhi-0008No-MK; Mon, 30 Jan 2023 11:08:22 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Mon, 30 Jan 2023 17:08:10 +0100 Message-Id: <20230130160810.14356-1-ludo@gnu.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <87y1pkypo1.fsf@gnu.org> References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Fixes . Fixes a bug whereby packages referred via 'ungexp' in package arguments would be "double-grafted": 'gexp->derivation' would first replace those references by references to the grafted package, only to repeat the grafting process on the result. Build systems such as 'gnu', 'cmake', and 'pyproject' were already doing this. Only the rest of them is affected. * guix/build-system/cargo.scm (cargo-build): Pass #:graft? #f to 'gexp->derivation'. * guix/build-system/copy.scm (copy-build): Likewise. * guix/build-system/dune.scm (dune-build): Likewise. * guix/build-system/font.scm (font-build): Likewise. * guix/build-system/guile.scm (guile-build): Likewise. (guile-cross-build): Likewise. * guix/build-system/ocaml.scm (ocaml-build): Likewise. * guix/build-system/ruby.scm (ruby-build): Likewise. * guix/build-system/scons.scm (scons-build): Likewise. * guix/build-system/texlive.scm (texlive-build): Likewise. * guix/build-system/waf.scm (waf-build): Likewise. --- guix/build-system/cargo.scm | 1 + guix/build-system/copy.scm | 1 + guix/build-system/dune.scm | 1 + guix/build-system/font.scm | 1 + guix/build-system/guile.scm | 2 ++ guix/build-system/ocaml.scm | 1 + guix/build-system/ruby.scm | 1 + guix/build-system/scons.scm | 1 + guix/build-system/texlive.scm | 1 + guix/build-system/waf.scm | 1 + 10 files changed, 11 insertions(+) diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 60c35eed07..912400a191 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -123,6 +123,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile)) (define (package-cargo-inputs p) diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm index 4894ba46fb..42a48b037c 100644 --- a/guix/build-system/copy.scm +++ b/guix/build-system/copy.scm @@ -129,6 +129,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile))) (define copy-build-system diff --git a/guix/build-system/dune.scm b/guix/build-system/dune.scm index 12100fd8e8..3f81d21441 100644 --- a/guix/build-system/dune.scm +++ b/guix/build-system/dune.scm @@ -157,6 +157,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile)) (define dune-build-system diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index 74dc80b5db..a99f76c66b 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -112,6 +112,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile))) (define font-build-system diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm index 36a88e181a..ffc892260a 100644 --- a/guix/build-system/guile.scm +++ b/guix/build-system/guile.scm @@ -114,6 +114,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile))) (define* (guile-cross-build name @@ -170,6 +171,7 @@ (define %outputs (gexp->derivation name builder #:system system #:target target + #:graft? #f #:guile-for-build guile))) (define guile-build-system diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm index b08985cd4d..921c1f8629 100644 --- a/guix/build-system/ocaml.scm +++ b/guix/build-system/ocaml.scm @@ -310,6 +310,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile)) (define ocaml-build-system diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm index 342daf7978..0aa273b4f4 100644 --- a/guix/build-system/ruby.scm +++ b/guix/build-system/ruby.scm @@ -114,6 +114,7 @@ (define build (gexp->derivation name build #:system system #:target #f + #:graft? #f #:modules imported-modules #:guile-for-build guile))) diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm index 7a02fa8a0f..9af24d40f8 100644 --- a/guix/build-system/scons.scm +++ b/guix/build-system/scons.scm @@ -121,6 +121,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile)) (define scons-build-system diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm index dbb72cd24a..336e192d83 100644 --- a/guix/build-system/texlive.scm +++ b/guix/build-system/texlive.scm @@ -182,6 +182,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:substitutable? substitutable? #:guile-for-build guile))) diff --git a/guix/build-system/waf.scm b/guix/build-system/waf.scm index e8cd5520b8..1d520050f6 100644 --- a/guix/build-system/waf.scm +++ b/guix/build-system/waf.scm @@ -111,6 +111,7 @@ (define build (gexp->derivation name build #:system system #:target #f + #:graft? #f #:modules imported-modules #:guile-for-build guile))) base-commit: dbf965dd7b76dfa50ee80e037a7404e163b9917c -- 2.39.1 From unknown Sat Aug 16 22:47:18 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Subject: bug#61180: closed (Re: bug#61180: [PATCH] build-system: Always pass #:graft? #f to 'gexp->derivation'.) Message-ID: References: <87ilgiwyy3.fsf@gnu.org> <20230130160810.14356-1-ludo@gnu.org> X-Gnu-PR-Message: they-closed 61180 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 61180@debbugs.gnu.org Date: Fri, 03 Feb 2023 15:29:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1675438142-12204-1" This is a multi-part message in MIME format... ------------=_1675438142-12204-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #61180: [PATCH] build-system: Always pass #:graft? #f to 'gexp->derivation'. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 61180@debbugs.gnu.org. --=20 61180: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D61180 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1675438142-12204-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 61180-done) by debbugs.gnu.org; 3 Feb 2023 15:28:35 +0000 Received: from localhost ([127.0.0.1]:39788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNxzM-00039s-8f for submit@debbugs.gnu.org; Fri, 03 Feb 2023 10:28:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37940) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNxzI-00039Y-0V; Fri, 03 Feb 2023 10:28:30 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNxzC-0006Pp-Nz; Fri, 03 Feb 2023 10:28:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=YmcVccpPwRC2DMcLwFxxNiLaoxpv6eLTpsJjVwCvryo=; b=IPtJVhaBeHWhzJc8Cbg6 8Bo4BzDDi8lZxl1IG7Jg8gqAnSFzYsNwiwSC9R4HjJLKWH1F8XyNhYJEvVx06uPeJhC7kV9V5CZfl PYGr7dMaoyegUa64crxgunnKLscLsnclLVmwYQgynbbnTq9HKiQVu3Yc/5vsqdDlVmsEQrPNthagD I7pZ26dsvniUL1GYZDXY2ouXQbpcKa0SW8aJJ1n0dPmfimH3ivLcHbd0mgDRtA/O7TJjJFaHmXFZw 2XALuvPoO+OOQjtOnijis8bC1qz+athCg3tswNzpdaX5iRuKjy/nlu2P5VM4/wxoobsaKkLUncViG d40BUaTOmfusAw==; Received: from [85.28.96.177] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNxzC-0004OV-Ai; Fri, 03 Feb 2023 10:28:22 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: 61180-done@debbugs.gnu.org Subject: Re: bug#61180: [PATCH] build-system: Always pass #:graft? #f to 'gexp->derivation'. References: <20230130160810.14356-1-ludo@gnu.org> Date: Fri, 03 Feb 2023 16:28:20 +0100 In-Reply-To: <20230130160810.14356-1-ludo@gnu.org> ("Ludovic =?utf-8?Q?Cou?= =?utf-8?Q?rt=C3=A8s=22's?= message of "Mon, 30 Jan 2023 17:08:10 +0100") Message-ID: <87ilgiwyy3.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 61180-done Cc: 60947-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Ludovic Court=C3=A8s skribis: > Fixes . > > Fixes a bug whereby packages referred via 'ungexp' in package arguments > would be "double-grafted": 'gexp->derivation' would first replace those > references by references to the grafted package, only to repeat the > grafting process on the result. > > Build systems such as 'gnu', 'cmake', and 'pyproject' were already doing > this. Only the rest of them is affected. Pushed as 25947bbc3217306742694304fa9b6499f0126c7a. No more building ruby-nokogiri building, comrades! Ludo=E2=80=99. ------------=_1675438142-12204-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 30 Jan 2023 16:08:26 +0000 Received: from localhost ([127.0.0.1]:50184 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMWhl-0008SM-Rh for submit@debbugs.gnu.org; Mon, 30 Jan 2023 11:08:26 -0500 Received: from lists.gnu.org ([209.51.188.17]:42132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMWhk-0008SD-7Y for submit@debbugs.gnu.org; Mon, 30 Jan 2023 11:08:24 -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 1pMWhk-0004JI-1Z for guix-patches@gnu.org; Mon, 30 Jan 2023 11:08:24 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMWhj-0005aW-CO; Mon, 30 Jan 2023 11:08:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=BiN/L2lEbzgrjV147QmDXp8Y07TwyxGdkMne5pBsGIE=; b=VcLzjW1KVLrqQFubfZZM nOHYxgts3xhLNpiAAeIF81mywxbkR/OGttxzpOzfV96+NQ8e/Yw8inbqmF/P/SdGhVZge78Yl0bHp TsL9I3h99hPZ2z0lIatozTLf3PK0G48m7TJxVm2bvkQGdpBY+A82kZ1VSIpJ99dHRarmdUeoeQqDQ 3G7xgfdf4IULHNOnTO54avAeARoe6EbDwF892Ie6MkhQTuNjgVfwI4vXNQCbzfNirJ1vO/DcegoWr +fK9muST9IUd8eci5E28TM6AuICOW8kcCdi9Xhh3rYk2/9D5jLrELv/s2oA4GSduehO/HTqJk5mHI ebibWke+2uQQhg==; Received: from [193.50.110.131] (helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pMWhi-0008No-MK; Mon, 30 Jan 2023 11:08:22 -0500 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: guix-patches@gnu.org Subject: [PATCH] build-system: Always pass #:graft? #f to 'gexp->derivation'. Date: Mon, 30 Jan 2023 17:08:10 +0100 Message-Id: <20230130160810.14356-1-ludo@gnu.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <87y1pkypo1.fsf@gnu.org> References: MIME-Version: 1.0 X-Debbugs-Cc: 60947@debbugs.gnu.org Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Fixes . Fixes a bug whereby packages referred via 'ungexp' in package arguments would be "double-grafted": 'gexp->derivation' would first replace those references by references to the grafted package, only to repeat the grafting process on the result. Build systems such as 'gnu', 'cmake', and 'pyproject' were already doing this. Only the rest of them is affected. * guix/build-system/cargo.scm (cargo-build): Pass #:graft? #f to 'gexp->derivation'. * guix/build-system/copy.scm (copy-build): Likewise. * guix/build-system/dune.scm (dune-build): Likewise. * guix/build-system/font.scm (font-build): Likewise. * guix/build-system/guile.scm (guile-build): Likewise. (guile-cross-build): Likewise. * guix/build-system/ocaml.scm (ocaml-build): Likewise. * guix/build-system/ruby.scm (ruby-build): Likewise. * guix/build-system/scons.scm (scons-build): Likewise. * guix/build-system/texlive.scm (texlive-build): Likewise. * guix/build-system/waf.scm (waf-build): Likewise. --- guix/build-system/cargo.scm | 1 + guix/build-system/copy.scm | 1 + guix/build-system/dune.scm | 1 + guix/build-system/font.scm | 1 + guix/build-system/guile.scm | 2 ++ guix/build-system/ocaml.scm | 1 + guix/build-system/ruby.scm | 1 + guix/build-system/scons.scm | 1 + guix/build-system/texlive.scm | 1 + guix/build-system/waf.scm | 1 + 10 files changed, 11 insertions(+) diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 60c35eed07..912400a191 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -123,6 +123,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile)) (define (package-cargo-inputs p) diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm index 4894ba46fb..42a48b037c 100644 --- a/guix/build-system/copy.scm +++ b/guix/build-system/copy.scm @@ -129,6 +129,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile))) (define copy-build-system diff --git a/guix/build-system/dune.scm b/guix/build-system/dune.scm index 12100fd8e8..3f81d21441 100644 --- a/guix/build-system/dune.scm +++ b/guix/build-system/dune.scm @@ -157,6 +157,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile)) (define dune-build-system diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index 74dc80b5db..a99f76c66b 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -112,6 +112,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile))) (define font-build-system diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm index 36a88e181a..ffc892260a 100644 --- a/guix/build-system/guile.scm +++ b/guix/build-system/guile.scm @@ -114,6 +114,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile))) (define* (guile-cross-build name @@ -170,6 +171,7 @@ (define %outputs (gexp->derivation name builder #:system system #:target target + #:graft? #f #:guile-for-build guile))) (define guile-build-system diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm index b08985cd4d..921c1f8629 100644 --- a/guix/build-system/ocaml.scm +++ b/guix/build-system/ocaml.scm @@ -310,6 +310,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile)) (define ocaml-build-system diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm index 342daf7978..0aa273b4f4 100644 --- a/guix/build-system/ruby.scm +++ b/guix/build-system/ruby.scm @@ -114,6 +114,7 @@ (define build (gexp->derivation name build #:system system #:target #f + #:graft? #f #:modules imported-modules #:guile-for-build guile))) diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm index 7a02fa8a0f..9af24d40f8 100644 --- a/guix/build-system/scons.scm +++ b/guix/build-system/scons.scm @@ -121,6 +121,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile)) (define scons-build-system diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm index dbb72cd24a..336e192d83 100644 --- a/guix/build-system/texlive.scm +++ b/guix/build-system/texlive.scm @@ -182,6 +182,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:substitutable? substitutable? #:guile-for-build guile))) diff --git a/guix/build-system/waf.scm b/guix/build-system/waf.scm index e8cd5520b8..1d520050f6 100644 --- a/guix/build-system/waf.scm +++ b/guix/build-system/waf.scm @@ -111,6 +111,7 @@ (define build (gexp->derivation name build #:system system #:target #f + #:graft? #f #:modules imported-modules #:guile-for-build guile))) base-commit: dbf965dd7b76dfa50ee80e037a7404e163b9917c -- 2.39.1 ------------=_1675438142-12204-1--