From 89912c766b67863e213d8ece8b94e93bcd27bc8d Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Sun, 25 Aug 2024 14:23:29 +0100
Subject: [PATCH] nixpkgs 24.11 qemu does not expect texinfo

---
 overlay.nix | 54 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/overlay.nix b/overlay.nix
index cc84a8f..4812fac 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -246,31 +246,35 @@ extraPkgs // {
 
   pppBuild = prev.ppp;
 
-  qemuLim = let q = prev.qemu.overrideAttrs (o: {
-    patches = o.patches ++ [
-      ./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";
-        hash = "sha256-jOsGka7xLkJznb9M90v5TsJraXXTAj84lcphcSxjYLU=";
-      })
-    ];
-  }); in q.override {
-    nixosTestRunner = true;
-    hostCpuTargets = map (f: "${f}-softmmu") [
-      "arm" "aarch64" "mips" "mipsel"
-    ];
-    sdlSupport = false;
-    numaSupport = false;
-    seccompSupport = false;
-    usbredirSupport = false;
-    libiscsiSupport = false;
-    tpmSupport = false;
-    uringSupport = false;
-    capstoneSupport = false;
-
-    texinfo = null;
-  };
-
+  qemuLim =
+    let
+      inherit (final) lib;
+      q = prev.qemu.overrideAttrs (o: {
+        patches = o.patches ++ [
+          ./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";
+            hash = "sha256-jOsGka7xLkJznb9M90v5TsJraXXTAj84lcphcSxjYLU=";
+          })
+        ];
+      });
+      overrides = {
+        nixosTestRunner = true;
+        hostCpuTargets = map (f: "${f}-softmmu") [
+          "arm" "aarch64" "mips" "mipsel"
+        ];
+        sdlSupport = false;
+        numaSupport = false;
+        seccompSupport = false;
+        usbredirSupport = false;
+        libiscsiSupport = false;
+        tpmSupport = false;
+        uringSupport = false;
+        capstoneSupport = false;
+      } // lib.optionalAttrs (lib.versionOlder lib.version "24.11") {
+        texinfo = null;
+      };
+    in q.override overrides;
   rsyncSmall =
     let
       r = prev.rsync.overrideAttrs (o: {