diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2024-06-02 23:42:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-02 23:42:06 +0200 |
commit | 729002e6ceb0cec4c9ee58b6b544bf5d1df43cb7 (patch) | |
tree | 2c2bbc04094ca1f7397c604e2f81cb59d764ba72 | |
parent | 9b3a337d37bc5306104d95f5c2621853218080b7 (diff) | |
parent | 69c2090e988b0a062b9ac2fa178e39989e2e080c (diff) |
Merge pull request #264635 from baloo/baloo/amazon-image/pkg-reimport
-rw-r--r-- | nixos/maintainers/scripts/ec2/amazon-image.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 357b86367d984..8b6a9bc52b128 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -71,9 +71,8 @@ in { ''; zfsBuilder = import ../../../lib/make-multi-disk-zfs-image.nix { - inherit lib config configFile; + inherit lib config configFile pkgs; inherit (cfg) contents format name; - pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package includeChannel = true; @@ -120,10 +119,9 @@ in { }; extBuilder = import ../../../lib/make-disk-image.nix { - inherit lib config configFile; + inherit lib config configFile pkgs; inherit (cfg) contents format name; - pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package fsType = "ext4"; partitionTableType = if config.ec2.efi then "efi" else "legacy+gpt"; |