raboof/liminix
1
0
Fork 0
forked from dan/liminix
Code Pull Requests Activity

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

12
overlay.nix
View File

@ -246,7 +246,10 @@ extraPkgs // {
pppBuild = prev.ppp; pppBuild = prev.ppp;
qemuLim = let q = prev.qemu.overrideAttrs (o: { qemuLim =
let
inherit (final) lib;
q = prev.qemu.overrideAttrs (o: {
patches = o.patches ++ [ patches = o.patches ++ [
./pkgs/qemu/arm-image-friendly-load-addr.patch ./pkgs/qemu/arm-image-friendly-load-addr.patch
(final.fetchpatch { (final.fetchpatch {
@ -254,7 +257,8 @@ extraPkgs // {
hash = "sha256-jOsGka7xLkJznb9M90v5TsJraXXTAj84lcphcSxjYLU="; hash = "sha256-jOsGka7xLkJznb9M90v5TsJraXXTAj84lcphcSxjYLU=";
}) })
]; ];
}); in q.override { });
overrides = {
nixosTestRunner = true; nixosTestRunner = true;
hostCpuTargets = map (f: "${f}-softmmu") [ hostCpuTargets = map (f: "${f}-softmmu") [
"arm" "aarch64" "mips" "mipsel" "arm" "aarch64" "mips" "mipsel"
@ -267,10 +271,10 @@ extraPkgs // {
tpmSupport = false; tpmSupport = false;
uringSupport = false; uringSupport = false;
capstoneSupport = false; capstoneSupport = false;
} // lib.optionalAttrs (lib.versionOlder lib.version "24.11") {
texinfo = null; texinfo = null;
}; };
in q.override overrides;
rsyncSmall = rsyncSmall =
let let
r = prev.rsync.overrideAttrs (o: { r = prev.rsync.overrideAttrs (o: {