diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:19:25 +0000 |
| commit | 55abc327b49b4097e48c916e40803caa8cf46e8f (patch) | |
| tree | 1c0420ab3fb21d9485460b912f1c3eae18781871 /nixpkgs/nixos/modules/image | |
| parent | 7936cf821dccc1eaade44b852db09d03fae8e5f3 (diff) | |
| parent | 18324978d632ffc55ef1d928e81630c620f4f447 (diff) | |
| download | nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.gz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.bz2 nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.lz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.xz nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.tar.zst nixlib-55abc327b49b4097e48c916e40803caa8cf46e8f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/nixos/modules/image')
| -rw-r--r-- | nixpkgs/nixos/modules/image/amend-repart-definitions.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/nixos/modules/image/amend-repart-definitions.py b/nixpkgs/nixos/modules/image/amend-repart-definitions.py index 52f10303eb5e..fa9b1544ae85 100644 --- a/nixpkgs/nixos/modules/image/amend-repart-definitions.py +++ b/nixpkgs/nixos/modules/image/amend-repart-definitions.py @@ -53,7 +53,7 @@ def add_closure_to_definition( source = Path(line.strip()) target = str(source.relative_to("/nix/store/")) - target = f":{target}" if strip_nix_store_prefix else "" + target = f":/{target}" if strip_nix_store_prefix else "" copy_files_lines.append(f"CopyFiles={source}{target}\n") @@ -102,7 +102,7 @@ def main() -> None: add_contents_to_definition(definition, contents) closure = config.get("closure") - strip_nix_store_prefix = config.get("stripStorePaths") + strip_nix_store_prefix = config.get("stripNixStorePrefix") add_closure_to_definition(definition, closure, strip_nix_store_prefix) print(target_dir.absolute()) |