movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

incus: fix OVMF path backward compatibility

Browse source 
incus 6.3.0 changed the OVMF path, but our module needs to support LTS
as well. Also move the newer OCI deps to be conditional on version.
This commit is contained in:
Adam Stephens 2024-07-20 09:47:25 -04:00
parent 7ff3f2842c
commit 28922c4421
No known key found for this signature in database
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/virtualisation/incus.nix
View file

@ -44,19 +44,21 @@ let
qemu-utils qemu-utils
qemu_kvm qemu_kvm
rsync rsync
skopeo
squashfs-tools-ng squashfs-tools-ng
squashfsTools squashfsTools
sshfs sshfs
swtpm swtpm
systemd systemd
thin-provisioning-tools thin-provisioning-tools
umoci
util-linux util-linux
virtiofsd virtiofsd
xdelta xdelta
xz xz
] ]
++ lib.optionals (lib.versionAtLeast cfg.package.version "6.3.0") [
skopeo
umoci
]
++ lib.optionals config.security.apparmor.enable [ ++ lib.optionals config.security.apparmor.enable [
apparmor-bin-utils apparmor-bin-utils
@ -111,10 +113,11 @@ let
environment = lib.mkMerge [ environment = lib.mkMerge [
{ {
INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config";
INCUS_EDK2_PATH = ovmf;
INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids"; INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids";
PATH = lib.mkForce serverBinPath; PATH = lib.mkForce serverBinPath;
} }
(lib.mkIf (lib.versionOlder cfg.package.version "6.3.0") { INCUS_OVMF_PATH = ovmf; })
(lib.mkIf (lib.versionAtLeast cfg.package.version "6.3.0") { INCUS_EDK2_PATH = ovmf; })
(lib.mkIf (cfg.ui.enable) { "INCUS_UI" = cfg.ui.package; }) (lib.mkIf (cfg.ui.enable) { "INCUS_UI" = cfg.ui.package; })
]; ];