Revert "nixos/documentation.nix: Only use store non-flake pkgs.path directly when already copied"
This reverts commit fecf325059
.
This commit is contained in:
parent
a732a8de1c
commit
647b304306
|
@ -71,14 +71,8 @@ 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 builtins.typeOf pkgs.path == "string" && isStorePath pkgs.path
|
if 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
|
||||||
|
|
Loading…
Reference in a new issue