Syzygial/NixMachines
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PinetabV: catch2 & registry fix

Browse Source
This commit is contained in:
David Crompton
2024-07-12 03:55:12 +00:00
parent 119d74c888
commit a46014bab7
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
machines/ptv/configuration.nix
View File

@@ -13,7 +13,7 @@ in {
system.stateVersion = "24.05"; system.stateVersion = "24.05";
nixpkgs.hostPlatform = "riscv64-linux"; nixpkgs.hostPlatform = "riscv64-linux";
networking.hostName = "ptv"; networking.hostName = "ptv";
nix.registry.nixpkgs.flake = inputs.nixpkgs; nix.registry.nixpkgs.flake = inputs.nixpkgs-stable;
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
nixpkgs.overlays = [ nixpkgs.overlays = [

6
machines/ptv/pkgs/default.nix
View File

@@ -23,8 +23,10 @@ in {
}); });
# See https://github.com/catchorg/Catch2/issues/2808 # See https://github.com/catchorg/Catch2/issues/2808
# Fixed by https://github.com/NixOS/nixpkgs/pull/295243 # Fixed by https://github.com/NixOS/nixpkgs/pull/295243
catch2_3 = prev.catch2_3.overrideAttrs ({ NIX_CFLAGS_COMPILE ? "", ... }: { catch2_3 = prev.catch2_3.overrideAttrs (old: {
NIX_CFLAGS_COMPILE = "${NIX_CFLAGS_COMPILE} -Wno-error=cast-align"; preConfigure = (old.preConfigure or "") + ''
export CFLAGS="$CFLAGS -Wno-error=cast-align"
'';
}); });
# One test times out # One test times out
json-glib = noCheck prev.json-glib; json-glib = noCheck prev.json-glib;