From 647b304306b5d483294754faf1951fe788d060c2 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 27 Jan 2022 12:33:15 +0100
Subject: [PATCH] Revert "nixos/documentation.nix: Only use store non-flake
 pkgs.path directly when already copied"

This reverts commit fecf32505984f4b8feae4c54663f322dcc8bd080.
---
 nixos/modules/misc/documentation.nix | 8 +-------
 1 file changed, 1 insertion(+), 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