nixos-modules: boot packages from buildPackages.buildPackages
This commit is contained in:
parent
adff162a29
commit
b77a91bc87
|
@ -411,7 +411,7 @@ in {
|
|||
virtualisation.useBootLoader = config.genode.boot.storeBackend != "memory";
|
||||
|
||||
virtualisation.qemu.options =
|
||||
let blockCommon = [ "-bios ${pkgs.buildPackages.OVMF.fd}/FV/OVMF.fd" ];
|
||||
let blockCommon = [ "-bios ${pkgs.buildPackages.buildPackages.OVMF.fd}/FV/OVMF.fd" ];
|
||||
in {
|
||||
fs = blockCommon;
|
||||
memory = [ ];
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
pkgs.stdenv.mkDerivation {
|
||||
name = "boot.qcow2";
|
||||
|
||||
nativeBuildInputs = with pkgs.buildPackages; [
|
||||
buildPackages.qemu_test
|
||||
nativeBuildInputs = with pkgs.buildPackages.buildPackages; [
|
||||
qemu_test
|
||||
utillinux
|
||||
zstd
|
||||
];
|
||||
|
|
|
@ -12,9 +12,9 @@ let
|
|||
consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles;
|
||||
|
||||
efiPrefix = if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
|
||||
"${pkgs.buildPackages.OVMF.fd}/FV/OVMF"
|
||||
"${pkgs.buildPackages.buildPackages.OVMF.fd}/FV/OVMF"
|
||||
else if pkgs.stdenv.isAarch64 then
|
||||
"${pkgs.buildPackages.OVMF.fd}/FV/AAVMF"
|
||||
"${pkgs.buildPackages.buildPackages.OVMF.fd}/FV/AAVMF"
|
||||
else
|
||||
throw "No EFI firmware available for platform";
|
||||
efiFirmware = "${efiPrefix}_CODE.fd";
|
||||
|
|
|
@ -87,6 +87,12 @@ in nullPkgs // {
|
|||
inherit flake;
|
||||
pkgs = final;
|
||||
};
|
||||
|
||||
grub2 = if stdenv.targetPlatform.isGenode then
|
||||
prev.buildPackages.grub2
|
||||
else
|
||||
prev.grub2;
|
||||
|
||||
libconfig =
|
||||
overrideAttrsHost (attrs: { configureFlags = [ "--disable-examples" ]; })
|
||||
libconfig;
|
||||
|
|
Loading…
Reference in New Issue