chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-11 18:32:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

docs: fix devmode for manuals

Browse Source 
hard-coding a relative path will use the calling process's working
directory, but we want the path relative to the Nix expression.
This commit is contained in:
Valentin Gagarin
2025-01-20 00:30:21 +01:00
parent 16b818f774
commit 61235d4471
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/doc-support/package.nix
View File

@@ -110,7 +110,7 @@ stdenvNoCC.mkDerivation (
shell = shell =
let let
devmode' = devmode.override { devmode' = devmode.override {
buildArgs = "./."; buildArgs = toString ../.;
open = "/share/doc/nixpkgs/manual.html"; open = "/share/doc/nixpkgs/manual.html";
}; };
nixos-render-docs-redirects' = writeShellScriptBin "redirects" "${lib.getExe nixos-render-docs-redirects} --file ${toString ../redirects.json} $@"; nixos-render-docs-redirects' = writeShellScriptBin "redirects" "${lib.getExe nixos-render-docs-redirects} --file ${toString ../redirects.json} $@";

2
nixos/doc/manual/shell.nix
View File

@@ -7,7 +7,7 @@ let
common = import ./common.nix; common = import ./common.nix;
inherit (common) outputPath indexPath; inherit (common) outputPath indexPath;
devmode = pkgs.devmode.override { devmode = pkgs.devmode.override {
buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}"; buildArgs = ''${toString ../../release.nix} -A manualHTML.${builtins.currentSystem}'';
open = "/${outputPath}/${indexPath}"; open = "/${outputPath}/${indexPath}";
}; };
nixos-render-docs-redirects = pkgs.writeShellScriptBin "redirects" "${pkgs.lib.getExe pkgs.nixos-render-docs-redirects} --file ${toString ./redirects.json} $@"; nixos-render-docs-redirects = pkgs.writeShellScriptBin "redirects" "${pkgs.lib.getExe pkgs.nixos-render-docs-redirects} --file ${toString ./redirects.json} $@";