diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-10-20 16:49:29 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-20 16:49:29 +0200 |
| commit | f84955422634f8652d4ece50831e05cdb63acb89 (patch) | |
| tree | a19497c2e89e335e205eba05df1d34957ad9e3b6 /nixos/lib/make-iso9660-image.nix | |
| parent | baf549433058e844ac3b8a402c1255f67c014ccb (diff) | |
| parent | d8924875983af60c3d53bdebba283aabdd9d48c4 (diff) | |
| download | nixlib-f84955422634f8652d4ece50831e05cdb63acb89.tar nixlib-f84955422634f8652d4ece50831e05cdb63acb89.tar.gz nixlib-f84955422634f8652d4ece50831e05cdb63acb89.tar.bz2 nixlib-f84955422634f8652d4ece50831e05cdb63acb89.tar.lz nixlib-f84955422634f8652d4ece50831e05cdb63acb89.tar.xz nixlib-f84955422634f8652d4ece50831e05cdb63acb89.tar.zst nixlib-f84955422634f8652d4ece50831e05cdb63acb89.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'nixos/lib/make-iso9660-image.nix')
| -rw-r--r-- | nixos/lib/make-iso9660-image.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index 8cd19b6e1874..0f3f2b5b5234 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -10,9 +10,9 @@ contents , # In addition to `contents', the closure of the store paths listed - # in `packages' are also placed in the Nix store of the CD. This is - # a list of attribute sets {object, symlink} where `object' if a - # store path whose closure will be copied, and `symlink' is a + # in `storeContents' are also placed in the Nix store of the CD. + # This is a list of attribute sets {object, symlink} where `object' + # is a store path whose closure will be copied, and `symlink' is a # symlink to `object' that will be added to the CD. storeContents ? [] |