kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

nixpkgsFlakeRef(): Use locked nixpkgs

Browse source
This commit is contained in:
Eelco Dolstra 2020-05-28 12:13:13 +02:00
parent 04fb4e8a0f
commit 6286272371
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/nix/installables.cc
View file

@ -503,9 +503,12 @@ FlakeRef InstallableFlake::nixpkgsFlakeRef() const
{
auto lockedFlake = getLockedFlake();
auto nixpkgsInput = lockedFlake->flake.inputs.find("nixpkgs");
if (nixpkgsInput != lockedFlake->flake.inputs.end()) {
return std::move(nixpkgsInput->second.ref);
auto nixpkgsInput = lockedFlake->lockFile.root->inputs.find("nixpkgs");
if (nixpkgsInput != lockedFlake->lockFile.root->inputs.end()) {
if (auto lockedNode = std::dynamic_pointer_cast<const flake::LockedNode>(nixpkgsInput->second)) {
debug("using nixpkgs flake '%s'", lockedNode->lockedRef);
return std::move(lockedNode->lockedRef);
}
}
return Installable::nixpkgsFlakeRef();