diff options
| author | kraem <ebrin.ronnie@protonmail.com> | 2022-01-05 12:36:54 +0100 |
|---|---|---|
| committer | kraem <ebrin.ronnie@protonmail.com> | 2022-01-05 12:36:54 +0100 |
| commit | 893ffee2866dbf9f2aa6e3128368e0cd5729e4b9 (patch) | |
| tree | 313f15d05ce266b1c7787380521b2dc9fd15e305 /nixos/modules/misc | |
| parent | be52ab786e4df742d186762b531ae20821b7ab93 (diff) | |
| download | nixpkgs-893ffee2866dbf9f2aa6e3128368e0cd5729e4b9.tar nixpkgs-893ffee2866dbf9f2aa6e3128368e0cd5729e4b9.tar.gz nixpkgs-893ffee2866dbf9f2aa6e3128368e0cd5729e4b9.tar.bz2 nixpkgs-893ffee2866dbf9f2aa6e3128368e0cd5729e4b9.tar.lz nixpkgs-893ffee2866dbf9f2aa6e3128368e0cd5729e4b9.tar.xz nixpkgs-893ffee2866dbf9f2aa6e3128368e0cd5729e4b9.tar.zst nixpkgs-893ffee2866dbf9f2aa6e3128368e0cd5729e4b9.zip | |
Revert "nixos/documentation: avoid copying nixpkgs subpaths"
builtins.storePath is not allowed in pure evaluation mode This reverts commit 1511e72b75b49cdeeee68def0c203f997d01bafa.
Diffstat (limited to 'nixos/modules/misc')
| -rw-r--r-- | nixos/modules/misc/documentation.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 70152c5d662..7d8fc08b60e 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -67,15 +67,11 @@ let (t == "directory" -> baseNameOf n != "tests") && (t == "file" -> hasSuffix ".nix" n) ); - pull = dir: - if isStorePath pkgs.path - then "${builtins.storePath pkgs.path}/${dir}" - else filter "${toString pkgs.path}/${dir}"; in pkgs.runCommand "lazy-options.json" { - libPath = pull "lib"; - pkgsLibPath = pull "pkgs/pkgs-lib"; - nixosPath = pull "nixos"; + libPath = filter "${toString pkgs.path}/lib"; + pkgsLibPath = filter "${toString pkgs.path}/pkgs/pkgs-lib"; + nixosPath = filter "${toString pkgs.path}/nixos"; modules = map (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy; } '' export NIX_STORE_DIR=$TMPDIR/store |