From a46014bab7f1ac87b3ce13228e4c2432662cd472 Mon Sep 17 00:00:00 2001
From: David Crompton <davidcrompton@duck.com>
Date: Fri, 12 Jul 2024 03:55:12 +0000
Subject: [PATCH] PinetabV: catch2 & registry fix

---
 machines/ptv/configuration.nix | 2 +-
 machines/ptv/pkgs/default.nix  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/machines/ptv/configuration.nix b/machines/ptv/configuration.nix
index d4ee26d..099ec28 100644
--- a/machines/ptv/configuration.nix
+++ b/machines/ptv/configuration.nix
@@ -13,7 +13,7 @@ in {
   system.stateVersion = "24.05";
   nixpkgs.hostPlatform = "riscv64-linux";
   networking.hostName = "ptv";
-  nix.registry.nixpkgs.flake = inputs.nixpkgs;
+  nix.registry.nixpkgs.flake = inputs.nixpkgs-stable;
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
   nixpkgs.overlays = [
diff --git a/machines/ptv/pkgs/default.nix b/machines/ptv/pkgs/default.nix
index 4b5dd2b..78752e1 100644
--- a/machines/ptv/pkgs/default.nix
+++ b/machines/ptv/pkgs/default.nix
@@ -23,8 +23,10 @@ in {
   });
   # See https://github.com/catchorg/Catch2/issues/2808
   # Fixed by https://github.com/NixOS/nixpkgs/pull/295243
-  catch2_3 = prev.catch2_3.overrideAttrs ({ NIX_CFLAGS_COMPILE ? "", ... }: {
-    NIX_CFLAGS_COMPILE = "${NIX_CFLAGS_COMPILE} -Wno-error=cast-align";
+  catch2_3 = prev.catch2_3.overrideAttrs (old: {
+    preConfigure = (old.preConfigure or "") + ''
+      export CFLAGS="$CFLAGS -Wno-error=cast-align"
+    '';
   });
   # One test times out
   json-glib = noCheck prev.json-glib;