riscbert: add workaround for broken klibc

2022-09-06 01:46:03 +02:00 · 2022-09-06 01:46:03 +02:00 · ba2e93b8ec
parent d55ef67118
commit ba2e93b8ec
1 changed files with 11 additions and 2 deletions
--- a/hosts/riscbert/default.nix
+++ b/hosts/riscbert/default.nix
@ -44,8 +44,17 @@
    daemonCPUSchedPolicy = "idle";
    daemonIOSchedClass = "idle";
  };
-  nixpkgs.config.packageOverrides = pkgs:
-    lib.genAttrs [ "openssh" ] (p: pkgs.${p}.overrideAttrs (oa: { doCheck = false; }));
+  nixpkgs.config.packageOverrides = pkgs: {
+    # TODO: https://github.com/NixOS/nixpkgs/pull/189932
+    klibc = pkgs.klibc.overrideAttrs (oa: {
+      makeFlags = map (s:
+        if s == "KLIBCARCH=riscv"
+        then "KLIBCARCH=riscv64"
+        else s
+      ) oa.makeFlags;
+    });
+  } //
+  lib.genAttrs [ "openssh" ] (p: pkgs.${p}.overrideAttrs (oa: { doCheck = false; }));

  system.stateVersion = "22.05";