Merge pull request nix-community#173 from alan-strohm/master

nixosGenerate: allow and suggest leaving pkgs set to null
wfranzini · Aug 17, 2022 · adccd19 · adccd19
2 parents ecef210 + f561d89
commit adccd19
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -170,15 +170,15 @@ An example `flake.nix` demonstrating this approach is below. `vmware` or
   outputs = { self, nixpkgs, nixos-generators, ... }: {
     packages.x86_64-linux = {
       vmware = nixos-generators.nixosGenerate {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        system = "x86_64-linux";
         modules = [
           # you can include your own nixos configuration here, i.e.
           # ./configuration.nix
         ];
         format = "vmware";
       };
       vbox = nixos-generators.nixosGenerate {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        system = "x86_64-linux";
         format = "virtualbox";
       };
     };

diff --git a/flake.nix b/flake.nix
@@ -21,17 +21,17 @@
     # example usage in flakes:
     #   outputs = { self, nixpkgs, nixos-generators, ...}: {
     #     vmware = nixos-generators.nixosGenerate {
-    #       pkgs = nixpkgs.legacyPackages.x86_64-linux;
+    #       system = "x86_64-linux";
     #       modules = [./configuration.nix];
     #       format = "vmware";
     #   };
     # }
-    nixosGenerate = { pkgs, format,  specialArgs ? { }, modules ? [ ] }:
+    nixosGenerate = { pkgs ? null, format,  system ? null, specialArgs ? { }, modules ? [ ] }:
     let 
       formatModule = builtins.getAttr format nixosModules;
       image = nixpkgs.lib.nixosSystem {
         inherit pkgs specialArgs;
-        system = pkgs.system;
+        system = if system != null then system else pkgs.system;
         modules = [
           formatModule
         ] ++ modules;