machines/sternenseemann/ludwig: workarounds initial i686 failures

1 files changed, 31 insertions, 3 deletions

diff --git a/machines/sternenseemann/ludwig.nix b/machines/sternenseemann/ludwig.nix
index 78b553e2..6f893d60 100644
--- a/machines/sternenseemann/ludwig.nix
+++ b/machines/sternenseemann/ludwig.nix
@@ -11,9 +11,37 @@
   config = {
     hardware.bluetooth.enable = false;
 
-    nixpkgs.localSystem = {
-      system = "i686-linux";
-      config = "i686-unknown-linux-gnu";
+    nixpkgs = {
+      localSystem = {
+        system = "i686-linux";
+        config = "i686-unknown-linux-gnu";
+      };
+
+      overlays = [
+        (self: super: {
+          tlp = super.tlp.overrideAttrs (_: {
+            # Avoid crash in pandoc which is a check dependency of tlp
+            # https://gitlab.haskell.org/ghc/ghc/-/issues/22002
+            doCheck = false;
+          });
+
+          upower = super.upower.overrideAttrs (_: {
+            # https://gitlab.freedesktop.org/upower/upower/-/issues/214
+            doCheck = false;
+          });
+
+          spidermonkey_91 = super.spidermonkey_91.overrideAttrs (old: {
+            # Work around spidermonkey not compiling with newer versions of glibc
+            # https://bugzilla.mozilla.org/show_bug.cgi?id=1729459#
+            patches = old.patches or [] ++ [
+              (pkgs.fetchpatch {
+                url = "https://bug1729459.bmoattachments.org/attachment.cgi?id=9250378";
+                sha256 = "00qzvzd4sjyr142lhfpw8wq2k88llh22xp60w5js821w6q9x3pf1";
+              })
+            ];
+          });
+        })
+      ];
     };
 
     system.stateVersion = "22.05";