diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2022-01-27 12:33:15 +0100 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2022-01-27 12:35:16 +0100 |
| commit | 647b304306b5d483294754faf1951fe788d060c2 (patch) | |
| tree | 44244127d2c1d7d6d88e8f3e5479f22d7e5dfb2a /nixos/modules/misc | |
| parent | a732a8de1ccb042cc05b1ac7defd7e4c9a91b4ff (diff) | |
| download | nixpkgs-647b304306b5d483294754faf1951fe788d060c2.tar nixpkgs-647b304306b5d483294754faf1951fe788d060c2.tar.gz nixpkgs-647b304306b5d483294754faf1951fe788d060c2.tar.bz2 nixpkgs-647b304306b5d483294754faf1951fe788d060c2.tar.lz nixpkgs-647b304306b5d483294754faf1951fe788d060c2.tar.xz nixpkgs-647b304306b5d483294754faf1951fe788d060c2.tar.zst nixpkgs-647b304306b5d483294754faf1951fe788d060c2.zip | |
Revert "nixos/documentation.nix: Only use store non-flake pkgs.path directly when already copied"
This reverts commit fecf32505984f4b8feae4c54663f322dcc8bd080.
Diffstat (limited to 'nixos/modules/misc')
| -rw-r--r-- | nixos/modules/misc/documentation.nix | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 59ded4b0188..361815b48d5 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -71,14 +71,8 @@ let # produce separate, smaller store paths # When already in the store, # 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: - if builtins.typeOf pkgs.path == "string" && isStorePath pkgs.path + if isStorePath pkgs.path then "${pkgs.path}/${dir}" else filter "${toString pkgs.path}/${dir}"; in |