cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #153592 from kraem/kraem/revert_1511e72

Browse source 
Revert "nixos/documentation: avoid copying nixpkgs subpaths"
This commit is contained in:
Robert Hensing 2022-01-05 13:09:19 +01:00 committed by GitHub
commit e0acc85451
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/misc/documentation.nix
View file

@ -67,15 +67,11 @@ let
(t == "directory" -> baseNameOf n != "tests") (t == "directory" -> baseNameOf n != "tests")
&& (t == "file" -> hasSuffix ".nix" n) && (t == "file" -> hasSuffix ".nix" n)
); );
pull = dir:
if isStorePath pkgs.path
then "${builtins.storePath pkgs.path}/${dir}"
else filter "${toString pkgs.path}/${dir}";
in in
pkgs.runCommand "lazy-options.json" { pkgs.runCommand "lazy-options.json" {
libPath = pull "lib"; libPath = filter "${toString pkgs.path}/lib";
pkgsLibPath = pull "pkgs/pkgs-lib"; pkgsLibPath = filter "${toString pkgs.path}/pkgs/pkgs-lib";
nixosPath = pull "nixos"; nixosPath = filter "${toString pkgs.path}/nixos";
modules = map (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy; modules = map (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy;
} '' } ''
export NIX_STORE_DIR=$TMPDIR/store export NIX_STORE_DIR=$TMPDIR/store