diff --git a/src/modules/integrations/git-hooks.nix b/src/modules/integrations/git-hooks.nix index 755a7e92da..b914b122d4 100644 --- a/src/modules/integrations/git-hooks.nix +++ b/src/modules/integrations/git-hooks.nix @@ -13,9 +13,9 @@ let # This affects all packages built with `buildPythonApplication` or `toPythonApplication`. # pre-commit is particularly annoying as it is difficult for end-users to track down. # Tracking: https://github.com/NixOS/nixpkgs/issues/302376 - packageBin = pkgs.runCommandLocal "pre-commit-bin" { } '' + packageBin = pkgs.runCommandLocal "pre-commit-bin" { meta.mainProgram = cfg.package.meta.mainProgram; } '' mkdir -p $out/bin - ln -s ${cfg.package}/bin/pre-commit $out/bin/pre-commit + ln -s ${lib.getExe cfg.package} $out/bin/${cfg.package.meta.mainProgram} ''; anyEnabled = builtins.any (hook: hook.enable) (lib.attrValues cfg.hooks); @@ -35,7 +35,7 @@ in (git-hooks-module + "/modules/all-modules.nix") { rootSrc = self; - package = pkgs.pre-commit; + package = lib.mkDefault pkgs.pre-commit; tools = import (git-hooks-module + "/nix/call-tools.nix") pkgs; } ]; @@ -94,7 +94,7 @@ in before = [ "devenv:enterShell" ]; }; "devenv:git-hooks:run" = { - exec = "pre-commit run -a"; + exec = "${packageBin.meta.mainProgram} run -a"; before = [ "devenv:enterTest" ]; }; };