[PATCH] release/live: fix Makefile dependency being missing in Nix shell
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 <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"; -- 2.51.2
Johannes Süllner <johannes.suellner@mailbox.org> writes:
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`.
Thanks for the fix! It needs a Signed-off-by for me to be able to take it. You can just include it in a reply this time if you want. I also like to add a Fixes tag for this sort of thing, with the idea that it's nice to collect the data about regressions about fixes. Somebody will probably do some interesting analysis on them some day. Fixes: a6d872a ("release/live: allow writes in "make run"")
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";
This patch has been committed as 9f33ec29d39df59589ed7c1b85d54e116e135df8, which can be viewed online at https://spectrum-os.org/git/spectrum/commit/?id=9f33ec29d39df59589ed7c1b85d5.... This is an automated message. Send comments/questions/requests to: Alyssa Ross <hi@alyssa.is>
participants (3)
-
Alyssa Ross -
Alyssa Ross -
Johannes Süllner