ilyakooo0/nix-bundle
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nix-bundle.git synced 2024-08-16 02:10:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Properly differentiate between derivation and store path.

Browse Source 
The previous check was actually not differentiating between the two
cases defined in `test.sh` (both cases were ignore and the if branch was
never used).

By using `isDerivation` we now properly distinguish between the two
cases, and add the missing context when necessary.
This commit is contained in:
Alois Cochard 2021-05-04 17:10:01 +02:00
parent 8e396533ef
commit 876dda8270
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
default.nix
View File

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