Skip to content

Commit 6694857

Browse files
committed
flake: simplify systems
We do not need the sophisticated logic as this will only run on x86_64.
1 parent 20201cc commit 6694857

File tree

1 file changed

+7
-17
lines changed

1 file changed

+7
-17
lines changed

flake.nix

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
dried-nix-flakes.url = "github:cyberus-technology/dried-nix-flakes";
66
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.11";
77

8-
# A local path can be used for developing or testing local changes. Make
9-
# sure the submodules in a local libvirt checkout are populated.
10-
libvirt-src = {
8+
# Our patched libvirt.
9+
libvirt-dev = {
10+
# A local path can be used for developing or testing local changes. Make
11+
# sure the submodules in a local libvirt checkout are populated.
1112
# url = "git+file:/home/pschuster/dev/libvirt?submodules=1";
12-
url = "git+https://github.com/cyberus-technology/libvirt?ref=gardenlinux&submodules=1";
13+
url = "git+https://github.com/phip1611/libvirt?ref=nix-2&submodules=1";
1314
# url = "git+ssh://git@gitlab.cyberus-technology.de/cyberus/cloud/libvirt?ref=managedsave-fix&submodules=1";
1415
flake = false;
1516
};
@@ -39,19 +40,7 @@
3940
inputs:
4041
let
4142
dnf = (inputs.dried-nix-flakes.for inputs).override {
42-
# Expose only platforms that the most restrictive set of packages supports.
43-
systems =
44-
let
45-
# The `x86_64-linux` attribute is used arbitrarily to access lib and the derivation's attributes.
46-
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
47-
inherit (pkgs) lib;
48-
intersectAll =
49-
lists: builtins.foldl' lib.intersectLists (builtins.head lists) (builtins.tail lists);
50-
in
51-
intersectAll [
52-
pkgs.cloud-hypervisor.meta.platforms
53-
pkgs.OVMF-cloud-hypervisor.meta.platforms
54-
];
43+
systems = ["x86_64-linux"];
5544
};
5645
inherit (dnf)
5746
exportOutputs
@@ -80,6 +69,7 @@
8069
rustToolchain = rust-bin.stable.latest.default;
8170
cloud-hypervisor-meta = prev.cloud-hypervisor.meta;
8271
};
72+
# libvirt =
8373
})
8474
];
8575

0 commit comments

Comments
 (0)