From a712080e2eee5ab5d1bd33e08fa4b59ee77719cb Mon Sep 17 00:00:00 2001
From: rope <fredrik@nordhammer.it>
Date: Mon, 28 Sep 2026 18:43:16 +0100
Subject: [PATCH] Eee: fix i686 build failures (imagemagick, upower, iniparser)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 hosts/FredOS-Eee.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/hosts/FredOS-Eee.nix b/hosts/FredOS-Eee.nix
index fde2ac4..908b7ba 100644
--- a/hosts/FredOS-Eee.nix
+++ b/hosts/FredOS-Eee.nix
@@ -19,6 +19,17 @@
       rsync = prev.rsync.overrideAttrs { doCheck = false; };
       # Tests need gjs -> spidermonkey, an hour+ of i686 compile for a check.
       libsecret = prev.libsecret.overrideAttrs { doCheck = false; };
+      # libultrahdr misses -latomic on i686; icon themes only need plain convert.
+      imagemagick = prev.imagemagick.override { libultrahdrSupport = false; };
+      # nixpkgs' own i686 test patch no longer applies; it only touches tests.
+      upower = prev.upower.overrideAttrs (o: {
+        patches = lib.filter
+          (p: !lib.hasSuffix "i686-test-remove-battery-check.patch" (toString p))
+          o.patches;
+        doCheck = false;
+      });
+      # 64-bit getint64 tests fail on 32-bit.
+      iniparser = prev.iniparser.overrideAttrs { doCheck = false; };
     })
   ];