@@ -11,10 +11,11 @@ let
1111 });
1212in rec {
1313 toStorePath = target:
14− # If a store path has been given but is a string, add the missing context
14+ # If a store path has been given but is not a derivation, add the missing context
1515 # to it so it will be propagated properly as a build input.
16− if builtins.isString target && lib.isStorePath target then
17− builtins.appendContext target { "${target}" = { path = true; }; }
16+ if !(lib.isDerivation target) && lib.isStorePath target then
17+ let path = toString target; in
18+ builtins.appendContext path { "${path}" = { path = true; }; }
1819 # Otherwise, add to the store. This takes care of appending the store path
1920 # in the context automatically.
2021 else "${target}";