From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 81D2F1680C; Sat, 30 Nov 2024 20:16:04 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 5CC9E16803; Sat, 30 Nov 2024 20:16:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DMARC_MISSING, RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=4.0.1 Received: from fout-a7-smtp.messagingengine.com (fout-a7-smtp.messagingengine.com [103.168.172.150]) by atuin.qyliss.net (Postfix) with ESMTPS id EBFE5167FE for ; Sat, 30 Nov 2024 20:15:58 +0000 (UTC) Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfout.phl.internal (Postfix) with ESMTP id A02A213803B0 for ; Sat, 30 Nov 2024 15:15:57 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Sat, 30 Nov 2024 15:15:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm3; t=1732997757; x=1733084157; bh=m+YzNfU49RgpN4zAn8hz/ 0HaFc1svZGMfcWQb2yKuZg=; b=b/F9heiqTUfnNVZtkkCbArPw2fQXsPkKA/zX0 qfIr0JrzCIdfvtL2HvvvcPPWHeRKNigLMaD9uMmM9hy2E+dBQF6iddWZgoZkTp9G fBRssqwTEi6wOT/GaIYuJXYHiPaXFRKLmS/AVgk1BNcDsyGTThJgc7nvANs51NR7 UqkPqkfualQu60WWiXM+tpWmpeX+XYoumndp1Cgw4O2LI32sI/rnEny88y6po+F0 6EivGL7DuzoXGKp9Pt1FfJV28ROwX+BvtIph/6PmsDzlJ0GX44rCwMv+IS29knTN 738HwGiE9rJJnGK7r/3mlE+Hm93SHs1Xtwj/eWT/KpDvrOHcg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1732997757; x=1733084157; bh=m+YzNfU49RgpN4zAn8hz/0HaFc1svZGMfcW Qb2yKuZg=; b=NJpY5ZQWA5N43Jvk6t+Dh6ruSzQBQdchLhFlJY9GangV0HRRReh YW4wpJeqqg7rUFfeW4DOz/nUPhNQIodnZFuzBmtMuABdIoMSvD+xzWzzF4QIdslW a2fT1MyelMsrhaLeFaz04wEd0TfM5jXV2W4EBU+kR+3Byl4XULJQsrT5RAmF67Gm NdaWwK9II8x3RIpTrHBz8GIQ9Ptdcr2REtgss0qBKT38R2oR3JwoiF4LM6YUDFnB lwhn/oh4pTCn5XGzbvqGwT9KAhUUSF/TV5R+SedvM7bYrf4u03Wkh1KilejAVPyL NxylDudvhRFKy8I50rJGL68X6LdgVUdFzVw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrheehgddufeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgggfestdekredtredttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihes rghlhihsshgrrdhisheqnecuggftrfgrthhtvghrnhephedvfffghfetieejgfetfedtgf fhvdehueehvdejudfggefgleejgfelfeevgfefnecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomhephhhisegrlhihshhsrgdrihhspdhnsggprhgtph htthhopedupdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeguvghvvghlsehsphgv tghtrhhumhdqohhsrdhorhhg X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sat, 30 Nov 2024 15:15:56 -0500 (EST) Received: by sf.qyliss.net (Postfix, from userid 1000) id 72AEF18BEE403; Sat, 30 Nov 2024 21:15:54 +0100 (CET) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH] release/combined: fix for __structuredAttrs Date: Sat, 30 Nov 2024 21:15:06 +0100 Message-ID: <20241130201506.507062-1-hi@alyssa.is> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: Q3YDRJGFRAE4Q5VA74HIURADXO7SKII6 X-Message-ID-Hash: Q3YDRJGFRAE4Q5VA74HIURADXO7SKII6 X-MailFrom: hi@alyssa.is X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: When I set __structuredAttrs for this derivation, these variables were no longer passed to the build, resulting in GRUB not getting installed properly. Fixes: 296ccff ("Build images with __structuredAttrs") Signed-off-by: Alyssa Ross --- release/combined/default.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/release/combined/default.nix b/release/combined/default.nix index 764e2c3..537c5ef 100644 --- a/release/combined/default.nix +++ b/release/combined/default.nix @@ -60,15 +60,22 @@ let esp = runCommand "esp.img" { nativeBuildInputs = [ grub libfaketime dosfstools mtools ]; - grubTargetDir = "${grub}/lib/grub/${grub.grubTarget}"; - # Definition copied from util/grub-install-common.c. - # Last checked: GRUB 2.06 - pkglib_DATA = [ - "efiemu32.o" "efiemu64.o" "moddep.lst" "command.lst" "fs.lst" "partmap.lst" - "parttool.lst" "video.lst" "crypto.lst" "terminal.lst" "modinfo.sh" - ]; + + env = { + grubTargetDir = "${grub}/lib/grub/${grub.grubTarget}"; + # Definition copied from util/grub-install-common.c. + # Last checked: GRUB 2.06 + pkglib_DATA = lib.escapeShellArgs [ + "efiemu32.o" "efiemu64.o" "moddep.lst" "command.lst" "fs.lst" + "partmap.lst" "parttool.lst" "video.lst" "crypto.lst" "terminal.lst" + "modinfo.sh" + ]; + }; + __structuredAttrs = true; + unsafeDiscardReferences = { out = true; }; + passthru = { inherit grubCfg; }; } '' truncate -s 15M $out base-commit: 741ed49303ffaba63c409962326ab447639e6e20 -- 2.47.0