Merge pull request #198294 from edolstra/no-toString
nixos/modules/misc/documentation.nix: Don't use toString on a path
This commit is contained in:
commit
39b10ad867
|
@ -56,6 +56,7 @@ let
|
|||
)
|
||||
pkgSet;
|
||||
in scrubbedEval.options;
|
||||
|
||||
baseOptionsJSON =
|
||||
let
|
||||
filter =
|
||||
|
@ -67,9 +68,9 @@ let
|
|||
);
|
||||
in
|
||||
pkgs.runCommand "lazy-options.json" {
|
||||
libPath = filter "${toString pkgs.path}/lib";
|
||||
pkgsLibPath = filter "${toString pkgs.path}/pkgs/pkgs-lib";
|
||||
nixosPath = filter "${toString pkgs.path}/nixos";
|
||||
libPath = filter (pkgs.path + "/lib");
|
||||
pkgsLibPath = filter (pkgs.path + "/pkgs/pkgs-lib");
|
||||
nixosPath = filter (pkgs.path + "/nixos");
|
||||
modules = map (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy;
|
||||
} ''
|
||||
export NIX_STORE_DIR=$TMPDIR/store
|
||||
|
@ -99,6 +100,7 @@ let
|
|||
exit 1
|
||||
} >&2
|
||||
'';
|
||||
|
||||
inherit (cfg.nixos.options) warningsAreErrors allowDocBook;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue