Unverified Commit 72735151 authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

Merge pull request #335660 from Gabriella439/gabriella/containers_nixpkgs.pkgs 

containers.*.config.nixpkgs: use `host.pkgs.stdenv.hostPlatform`
parents 4e2bfbe1 79e5dbb2

nixos/modules/virtualisation/nixos-containers.nix

+4 −3
Original line number Diff line number Diff line
@@ -488,9 +488,10 @@ in 
                      extraConfig = { options, ... }: {

                        _file = "module at ${__curPos.file}:${toString __curPos.line}";

                        config = {

                          nixpkgs = if options.nixpkgs?hostPlatform && host.options.nixpkgs.hostPlatform.isDefined

                                    then { inherit (host.config.nixpkgs) hostPlatform; }

                                    else { inherit (host.config.nixpkgs) localSystem; }

                          nixpkgs =

                            if options.nixpkgs?hostPlatform

                            then { inherit (host.pkgs.stdenv) hostPlatform; }

                            else { localSystem = host.pkgs.stdenv.hostPlatform; }

                          ;

                          boot.isContainer = true;

                          networking.hostName = mkDefault name;