dan/liminix
1
0
Fork 5
Code

nixpkgs 24.11 qemu does not expect texinfo

Browse Source
This commit is contained in:
Daniel Barlow 2024-08-25 14:23:29 +01:00
parent 9828b007ae
commit 89912c766b
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
overlay.nix
View File

@ -246,31 +246,35 @@ extraPkgs // {
pppBuild = prev.ppp; pppBuild = prev.ppp;
qemuLim = let q = prev.qemu.overrideAttrs (o: { qemuLim =
patches = o.patches ++ [ let
./pkgs/qemu/arm-image-friendly-load-addr.patch inherit (final) lib;
(final.fetchpatch { q = prev.qemu.overrideAttrs (o: {
url = "https://lore.kernel.org/qemu-devel/20220322154658.1687620-1-raj.khem@gmail.com/raw"; patches = o.patches ++ [
hash = "sha256-jOsGka7xLkJznb9M90v5TsJraXXTAj84lcphcSxjYLU="; ./pkgs/qemu/arm-image-friendly-load-addr.patch
}) (final.fetchpatch {
]; url = "https://lore.kernel.org/qemu-devel/20220322154658.1687620-1-raj.khem@gmail.com/raw";
}); in q.override { hash = "sha256-jOsGka7xLkJznb9M90v5TsJraXXTAj84lcphcSxjYLU=";
nixosTestRunner = true; })
hostCpuTargets = map (f: "${f}-softmmu") [ ];
"arm" "aarch64" "mips" "mipsel" });
]; overrides = {
sdlSupport = false; nixosTestRunner = true;
numaSupport = false; hostCpuTargets = map (f: "${f}-softmmu") [
seccompSupport = false; "arm" "aarch64" "mips" "mipsel"
usbredirSupport = false; ];
libiscsiSupport = false; sdlSupport = false;
tpmSupport = false; numaSupport = false;
uringSupport = false; seccompSupport = false;
capstoneSupport = false; usbredirSupport = false;
libiscsiSupport = false;
texinfo = null; tpmSupport = false;
}; uringSupport = false;
capstoneSupport = false;
} // lib.optionalAttrs (lib.versionOlder lib.version "24.11") {
texinfo = null;
};
in q.override overrides;
rsyncSmall = rsyncSmall =
let let
r = prev.rsync.overrideAttrs (o: { r = prev.rsync.overrideAttrs (o: {