From 8c9b27dc1b8b42229d15e7d7b37f376a237fe0b1 Mon Sep 17 00:00:00 2001 From: Cassie Cheung Date: Thu, 27 Feb 2025 20:17:31 +0800 Subject: [PATCH] fix(common): don't coerce nix to build broken stuff --- flake.nix | 1 + nix/common.nix | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 9008567..8ed35c1 100644 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,7 @@ in { formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; + packages.${system} = lib.genAttrs isos ( iso: (lib.nixosSystem { diff --git a/nix/common.nix b/nix/common.nix index f2c78e1..984b948 100644 --- a/nix/common.nix +++ b/nix/common.nix @@ -29,10 +29,13 @@ git python3 dmg2img - (pkgs.callPackage ./pkgs/firmware-script.nix { }) + (callPackage ./pkgs/firmware-script.nix { }) ]; - # ZFS is (sometimes) broken and prevents building without this - nixpkgs.config.allowBroken = true; + # Don't actually let broken stuff sneak into the ISO. If ZFS breaks, it actually breaks building the kernel (module) + # due to an upstream check and this wouldn't do anything to stop that from happening. + ## ZFS is (sometimes) broken and prevents building without this + ## nixpkgs.config.allowBroken = true; + nixpkgs.hostPlatform = "x86_64-linux"; # t2 is x86_64-linux only }