Fix evaluation error

Author: lucperkins

flake.nix

@@ -78,16 +78,12 @@
         system:
         let
           pkgs = nixpkgsFor.${system}.native;
-          hooksSettings = import ./packaging/pre-commit-hook-settings.nix {
-            inherit lib pkgs;
+          hooksConfig = import ./packaging/pre-commit-hook-settings.nix {
+            inherit pkgs lib;
             src = self;
           };
-          git-hooks = inputs.git-hooks-nix.lib.${system};
         in
-        {
-          check = git-hooks.run hooksSettings;
-          settings = hooksSettings;
-        };
+        inputs.git-hooks-nix.lib.${system}.run (hooksConfig // { src = self; });
 
       # Memoize nixpkgs for different platforms for efficiency.
       nixpkgsFor = forAllSystems (

packaging/dev-shell.nix

@@ -73,9 +73,7 @@ pkgs.nixComponents2.nix-util.overrideAttrs (
 
     env = {
       # For `make format`, to work without installing pre-commit
-      _NIX_PRE_COMMIT_HOOKS_CONFIG = "${(pkgs.formats.yaml { }).generate "pre-commit-config.yaml"
-        modular.settings
-      }";
+      _NIX_PRE_COMMIT_HOOKS_CONFIG = modular.shellHook;
     }
     // lib.optionalAttrs stdenv.hostPlatform.isLinux {
       CC_LD = "mold";

packaging/pre-commit-hook-settings.nix

@@ -42,7 +42,7 @@
         entry = "${pkgs.writeScript "format-meson" ''
           #!${pkgs.runtimeShell}
           for file in "$@"; do
-            ${lib.getExe meson} format -ic ${./meson.format} "$file"
+            ${lib.getExe meson} format -ic ${../meson.format} "$file"
           done
         ''}";
       };