diff --git a/tools/cheddar/default.nix b/tools/cheddar/default.nix index c8d7ba5ff..8d37694c0 100644 --- a/tools/cheddar/default.nix +++ b/tools/cheddar/default.nix @@ -9,4 +9,15 @@ depot.third_party.naersk.buildPackage { # plus additional languages we care about. BAT_SYNTAXES = "${depot.third_party.bat_syntaxes}"; }; + + passthru = { + # Wrapper for cgit which can't be told to pass arguments to a filter + about-filter = pkgs.writeShellScriptBin "cheddar-about" '' + exec ${depot.tools.cheddar}/bin/cheddar --about-filter $@ + ''; + }; + + meta.targets = [ + "about-filter" + ]; } diff --git a/web/cgit-taz/default.nix b/web/cgit-taz/default.nix index 83ec822e5..d20bbbe31 100644 --- a/web/cgit-taz/default.nix +++ b/web/cgit-taz/default.nix @@ -10,15 +10,12 @@ let writeText ; - sourceFilter = writeShellScriptBin "cheddar-about" '' - exec ${depot.tools.cheddar}/bin/cheddar --about-filter $@ - ''; cgitConfig = writeText "cgitrc" '' # Global configuration virtual-root=/ enable-http-clone=0 readme=:README.md - about-filter=${sourceFilter}/bin/cheddar-about + about-filter=${depot.tools.cheddar.about-filter}/bin/cheddar-about source-filter=${depot.tools.cheddar}/bin/cheddar enable-log-filecount=1 enable-log-linecount=1