From 4e2ae289ce87dd25ae5ebea101900f34686f986a Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Mon, 20 Jan 2025 00:30:21 +0100 Subject: [PATCH] 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. --- doc/doc-support/package.nix | 2 +- nixos/doc/manual/shell.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index bc5566f3cbd3e..f316656a585c1 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -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} $@"; diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix index 4f6ab400f22c7..6e9d253e47183 100644 --- a/nixos/doc/manual/shell.nix +++ b/nixos/doc/manual/shell.nix @@ -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} $@";