Skip to content

Commit 8c9b27d

Browse files
committed
fix(common): don't coerce nix to build broken stuff
1 parent 57cf954 commit 8c9b27d

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
in
3030
{
3131
formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
32+
3233
packages.${system} = lib.genAttrs isos (
3334
iso:
3435
(lib.nixosSystem {

nix/common.nix

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@
2929
git
3030
python3
3131
dmg2img
32-
(pkgs.callPackage ./pkgs/firmware-script.nix { })
32+
(callPackage ./pkgs/firmware-script.nix { })
3333
];
3434

35-
# ZFS is (sometimes) broken and prevents building without this
36-
nixpkgs.config.allowBroken = true;
35+
# Don't actually let broken stuff sneak into the ISO. If ZFS breaks, it actually breaks building the kernel (module)
36+
# due to an upstream check and this wouldn't do anything to stop that from happening.
37+
## ZFS is (sometimes) broken and prevents building without this
38+
## nixpkgs.config.allowBroken = true;
39+
3740
nixpkgs.hostPlatform = "x86_64-linux"; # t2 is x86_64-linux only
3841
}

0 commit comments

Comments
 (0)