Skip to content

Commit

Permalink
docs: fix devmode for manuals
Browse files Browse the repository at this point in the history
hard-coding a relative path will use the calling process's working
directory, but we want the path relative to the Nix expression.
  • Loading branch information
fricklerhandwerk committed Jan 24, 2025
1 parent 16b818f commit 61235d4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion doc/doc-support/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ stdenvNoCC.mkDerivation (
shell =
let
devmode' = devmode.override {
buildArgs = "./.";
buildArgs = toString ../.;
open = "/share/doc/nixpkgs/manual.html";
};
nixos-render-docs-redirects' = writeShellScriptBin "redirects" "${lib.getExe nixos-render-docs-redirects} --file ${toString ../redirects.json} $@";
Expand Down
2 changes: 1 addition & 1 deletion nixos/doc/manual/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let
common = import ./common.nix;
inherit (common) outputPath indexPath;
devmode = pkgs.devmode.override {
buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}";
buildArgs = ''${toString ../../release.nix} -A manualHTML.${builtins.currentSystem}'';
open = "/${outputPath}/${indexPath}";
};
nixos-render-docs-redirects = pkgs.writeShellScriptBin "redirects" "${pkgs.lib.getExe pkgs.nixos-render-docs-redirects} --file ${toString ./redirects.json} $@";
Expand Down

0 comments on commit 61235d4

Please sign in to comment.