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 6F29F3CED; Sat, 06 Dec 2025 14:19:52 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id D32CD3CCD; Sat, 06 Dec 2025 14:19:49 +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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by atuin.qyliss.net (Postfix) with ESMTPS id AA60F3C9C for ; Sat, 06 Dec 2025 14:19:47 +0000 (UTC) Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4dNr3h3j5Vz9stW for ; Sat, 6 Dec 2025 15:19:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1765030784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=FCsNGehzPWNvwKB8MPDyA2Ul+NDA9167mgbsFv7A1L0=; b=CvgXStEqd7g5U1ET0L5Pl87fUTEkOU6Bo4SbaJ45SNga84Pe/IlEZRc71hqlFSwdO729fT Zug5QqH0n+v1VQAE7mfPcznS1AUqFAU4rBKLLDQkL0nZM5SqP7B5veZDhXI/ij1YCF7bgU JSNA3w1/+/p0n+SD7e/sWreUg36RKLSHIl2OPGEebXTERI+XaanA4LpV10Rwzb0c8fFrD4 KpEQimS05W/1TydPaQVsBEuTqEnFrppTHMRslgTz2wPmxGmg8ehEV/NS3eQi319Ei+vXd4 IsT7hcComB1To/icuTnMcBe3E1typIFBLwouiUjaKPMJQMMV6wt+Kj1eXvKCFg== From: =?UTF-8?q?Johannes=20S=C3=BCllner?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1765030783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=FCsNGehzPWNvwKB8MPDyA2Ul+NDA9167mgbsFv7A1L0=; b=xxBM5OACTQF7KxqfzwAifHo7VGA8U/eMiHsSlFDCq+xAIt4pYdK9BOtSOc6kxe9sP0wXEJ ZlgYIgTS0KH+pSAPmbcSirn0IzKHwgBa8jIBMjwgFObxZQHGc7NAkr83rs6s6rHS8WoAgd CEFNZgEtAdXYCR8hjgQ3VZ7AEuKk8ACUaBr3etn9iktNELIr5MtS4X9lYiLo4sa9EnFs2X W7PoJbO84w7H21SBz61Lbrxec6je+lf8iViZH0ru/It1CP8mAjGsHupbXfjAVErtwjeISF F3GQ5z1EdABch728UGb0MEWYGV4CVRIhQn+wK8afGAgtJOBCGe/cW3uxVYf6FQ== To: devel@spectrum-os.org Subject: [PATCH] release/live: fix Makefile dependency being missing in Nix shell Date: Sat, 6 Dec 2025 15:18:26 +0100 Message-ID: <20251206141900.18119-1-johannes.suellner@mailbox.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MBO-RS-ID: 6489fb259e8d1e42226 X-MBO-RS-META: pbhgto8pcuk6uizd3obqchyjwj9sqhgi Message-ID-Hash: NHLIBRLK62VTX63LWGIGYGRRHOY5HGEF X-Message-ID-Hash: NHLIBRLK62VTX63LWGIGYGRRHOY5HGEF X-MailFrom: johannes.suellner@mailbox.org 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 CC: =?UTF-8?q?Johannes=20S=C3=BCllner?= 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: In commit a6d872ae, a Btrfs userdata partition was added to the live VM that can be startet with `make run`. The Makefile creates this partition and therefor requires `btrfs-progs`. --- release/live/shell.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/live/shell.nix b/release/live/shell.nix index e542793..a52c9b1 100644 --- a/release/live/shell.nix +++ b/release/live/shell.nix @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2021-2024 Alyssa Ross import ../../lib/call-package.nix ( -{ callSpectrumPackage, config, stdenv, qemu_kvm }: +{ callSpectrumPackage, config, stdenv, btrfs-progs, qemu_kvm }: let efi = callSpectrumPackage ../../host/efi.nix {}; @@ -11,7 +11,7 @@ in (callSpectrumPackage ./. {}).overrideAttrs ( { nativeBuildInputs ? [], env ? {}, ... }: { - nativeBuildInputs = nativeBuildInputs ++ [ qemu_kvm ]; + nativeBuildInputs = nativeBuildInputs ++ [ btrfs-progs qemu_kvm ]; env = env // { OVMF_CODE = "${qemu_kvm}/share/qemu/edk2-${stdenv.hostPlatform.qemuArch}-code.fd"; -- 2.51.2