Merge pull request 'Make treefmt-nix optional' (#2582) from Enzime/clan-core:push-ntosnzxwuvmq into main

2024-12-10 07:05:32 +00:00
parent 1c23cfa603 68fbffec48
commit 8d505f6ee5
1 changed files with 4 additions and 2 deletions
--- a/flake.nix
+++ b/flake.nix
@@ -45,13 +45,15 @@
          # TODO: migrate this @davHau
          # ./docs/flake-module
          ./docs/nix/flake-module.nix
-          ./formatter.nix
          ./lib/flake-module.nix
          ./nixosModules/flake-module.nix
          ./nixosModules/clanCore/vars/flake-module.nix
          ./pkgs/flake-module.nix
          ./templates/flake-module.nix
-        ];
+          # Make treefmt-nix optional
+          # This only works if you set inputs.clan-core.inputs.treefmt-nix.follows
+          # to a non-empty input that doesn't export a flakeModule
+        ] ++ inputs.nixpkgs.lib.optional (inputs.treefmt-nix ? flakeModule) ./formatter.nix;
      }
    );
 }