|
34 | 34 | ) |
35 | 35 | from ..cri import get_cri_socket, list_container_ids |
36 | 36 | from ..events import report_event |
37 | | -from ..nix import fetch_packages, get_build_args, get_closure_paths, get_current_system |
| 37 | +from ..nix import fetch_packages, get_build_args, get_current_system |
38 | 38 | from ..store import extract_store_paths |
39 | 39 | from ..volume import prepare_volume |
40 | 40 | from .annotations import parse_nix_rw, parse_store_mounts |
@@ -522,10 +522,8 @@ async def _spawn_build_task( |
522 | 522 | await fetch_packages(store_paths, volume_path, extra_args) |
523 | 523 | logger.debug(f"fetch_packages completed for container={container_id!r}") |
524 | 524 |
|
525 | | - # Get all paths |
526 | | - paths = await get_closure_paths(store_paths) |
527 | | - # Hardlink closure into volume |
528 | | - await prepare_volume(volume_path, paths, None) |
| 525 | + # Hardlink closure into volume (prepare_volume handles closure expansion) |
| 526 | + await prepare_volume(volume_path, store_paths, None) |
529 | 527 | nix_tree_path = volume_path / "nix" |
530 | 528 |
|
531 | 529 | # Wait for nri-wait to report PID+bundle (arrives when the createRuntime hook fires). |
@@ -568,7 +566,7 @@ async def _spawn_build_task( |
568 | 566 | logger.info(f"Removed from pending_builds for container={container_id!r}") |
569 | 567 |
|
570 | 568 | # Copy all packages to cache in background |
571 | | - schedule_copy_to_cache(paths) |
| 569 | + schedule_copy_to_cache(store_paths) |
572 | 570 |
|
573 | 571 | # Report successful build |
574 | 572 | await report_event( |
|
0 commit comments