ehmry/sigil
ehmry
/
sigil
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

nixos-modules: boot packages from buildPackages.buildPackages

This commit is contained in:
Ehmry - 2021-02-06 21:11:39 +01:00
parent adff162a29
commit b77a91bc87
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos-modules/genode-core.nix
View File

@ -411,7 +411,7 @@ in {
virtualisation.useBootLoader = config.genode.boot.storeBackend != "memory"; virtualisation.useBootLoader = config.genode.boot.storeBackend != "memory";
virtualisation.qemu.options = 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 { in {
fs = blockCommon; fs = blockCommon;
memory = [ ]; memory = [ ];

4
nixos-modules/lib/make-bootable-image.nix
View File

@ -4,8 +4,8 @@
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
name = "boot.qcow2"; name = "boot.qcow2";
nativeBuildInputs = with pkgs.buildPackages; [ nativeBuildInputs = with pkgs.buildPackages.buildPackages; [
buildPackages.qemu_test qemu_test
utillinux utillinux
zstd zstd
]; ];

4
nixos-modules/qemu-vm.nix
View File

@ -12,9 +12,9 @@ let
consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles; consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles;
efiPrefix = if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then 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 else if pkgs.stdenv.isAarch64 then
"${pkgs.buildPackages.OVMF.fd}/FV/AAVMF" "${pkgs.buildPackages.buildPackages.OVMF.fd}/FV/AAVMF"
else else
throw "No EFI firmware available for platform"; throw "No EFI firmware available for platform";
efiFirmware = "${efiPrefix}_CODE.fd"; efiFirmware = "${efiPrefix}_CODE.fd";

6
overlay/default.nix
View File

@ -87,6 +87,12 @@ in nullPkgs // {
inherit flake; inherit flake;
pkgs = final; pkgs = final;
}; };
grub2 = if stdenv.targetPlatform.isGenode then
prev.buildPackages.grub2
else
prev.grub2;
libconfig = libconfig =
overrideAttrsHost (attrs: { configureFlags = [ "--disable-examples" ]; }) overrideAttrsHost (attrs: { configureFlags = [ "--disable-examples" ]; })
libconfig; libconfig;