From 5dbb297adf025d1ba8810127346a3d58c0226439 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Thu, 18 Jan 2024 15:59:51 +0100 Subject: [PATCH] Fix qemu without rutabagaSupport --- configuration.nix | 15 ++++++++++++++- flake.nix | 2 +- overlay.nix | 2 ++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index 9a8f478..c66e04b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,5 +1,11 @@ -{ lib, ... }: +{ config, lib, pkgs, modulesPath, ... }: + { + imports = [ + "${modulesPath}/profiles/base.nix" + #"${modulesPath}/virtualisation/qemu-vm.nix" + ]; + networking.hostName = "visionfive-nix"; boot = { @@ -12,10 +18,17 @@ "9pnet" "9pnet_virtio" ]; + + loader = { + grub.enable = false; + generic-extlinux-compatible.enable = true; + }; }; nixpkgs.overlays = [ (import ./overlay.nix) ]; # Enable ssh on boot services.openssh.enable = true; + + system.stateVersion = "24.05"; } diff --git a/flake.nix b/flake.nix index fa94cfd..3d0229b 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ pkgs = import nixpkgs { inherit system; }; modules = [ ./configuration.nix - "${nixos-hardware}/starfive/visionfive/v2/sd-image-installer.nix" + #"${nixos-hardware}/starfive/visionfive/v2/sd-image-installer.nix" ]; in { overlay = import ./overlay.nix; diff --git a/overlay.nix b/overlay.nix index 2f973f3..fba77b1 100644 --- a/overlay.nix +++ b/overlay.nix @@ -18,4 +18,6 @@ final: prev: systemd = prev.systemd.overrideAttrs (old: { CFLAGS = "-Wno-error=format-overflow"; }); + + qemu = prev.qemu.override { rutabagaSupport = false; }; }