summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorRobert Hensing <roberth@users.noreply.github.com>2022-10-28 22:28:08 +0200
committerGitHub <noreply@github.com>2022-10-28 22:28:08 +0200
commit39b10ad86715c0afac8cccfaf58f6b6aacbfb0b6 (patch)
tree9299c44c679ce19c48085250069d874f23c9a48d /nixos
parentf915e72b6d6284a8bb33c33336de5358d30859b9 (diff)
parent2e860868fe28810f45f5d64df766959bf117f366 (diff)
Merge pull request #198294 from edolstra/no-toString
nixos/modules/misc/documentation.nix: Don't use toString on a path
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/misc/documentation.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index e85ad4efd0089..aa6e40f43705e 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -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;
   };