From: "Johannes Süllner" <johannes.suellner@mailbox.org>
To: devel@spectrum-os.org
Cc: "Johannes Süllner" <johannes.suellner@mailbox.org>
Subject: [PATCH] release/live: fix a Makefile dependency being missing in Nix shell
Date: Sat, 6 Dec 2025 19:30:33 +0100 [thread overview]
Message-ID: <20251206183102.91691-2-johannes.suellner@mailbox.org> (raw)
In-Reply-To: <87pl8rjyui.fsf@alyssa.is>
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`.
Fixes: a6d872a ("release/live: allow writes in "make run"")
Signed-off-by: Johannes Süllner <johannes.suellner@mailbox.org>
---
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 <hi@alyssa.is>
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";
next prev parent reply other threads:[~2025-12-06 18:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-06 14:18 [PATCH] release/live: fix Makefile dependency being missing in Nix shell Johannes Süllner
2025-12-06 17:37 ` Alyssa Ross
2025-12-06 18:30 ` Johannes Süllner [this message]
2025-12-06 18:51 ` [PATCH] release/live: fix a " Alyssa Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251206183102.91691-2-johannes.suellner@mailbox.org \
--to=johannes.suellner@mailbox.org \
--cc=devel@spectrum-os.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).