dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos/documentation.nix: Only use store non-flake pkgs.path directly when already copied

Browse Source
This commit is contained in:
Robert Hensing 2022-01-05 14:37:28 +01:00
parent 15a00be189
commit fecf325059
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/misc/documentation.nix
View File

@ -71,8 +71,14 @@ let
# produce separate, smaller store paths # produce separate, smaller store paths
# When already in the store, # When already in the store,
# avoid copying; reuse the whole nixpkgs sources # avoid copying; reuse the whole nixpkgs sources
#
# We can only avoid copying when pkgs.path is already a string. A path
# value can not be converted to a store path without rehashing it.
# builtins.storePath would be a solution but is currently off-limits
# because of https://github.com/NixOS/nix/issues/1888
# and https://github.com/NixOS/nix/issues/5868
pull = dir: pull = dir:
if isStorePath pkgs.path if builtins.typeOf pkgs.path == "string" && isStorePath pkgs.path
then "${pkgs.path}/${dir}" then "${pkgs.path}/${dir}"
else filter "${toString pkgs.path}/${dir}"; else filter "${toString pkgs.path}/${dir}";
in in