Commit 61235d44 authored by Valentin Gagarin's avatar Valentin Gagarin
Browse files

docs: fix devmode for manuals 

hard-coding a relative path will use the calling process's working
directory, but we want the path relative to the Nix expression.
parent 16b818f7

doc/doc-support/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -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} $@";

nixos/doc/manual/shell.nix

+1 −1
Original line number Diff line number Diff line
@@ -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} $@";