colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #195681 from maifel-maifel/mr-containers-hostPlatform

Browse Source 
nixos/containers: now uses nixpkgs.hostPlatform
This commit is contained in:
Robert Hensing 2022-10-27 17:52:45 +02:00 committed by GitHub
commit 8837a5d68e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/virtualisation/nixos-containers.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, ... }@host:
with lib;
@ -284,7 +284,6 @@ let
DeviceAllow = map (d: "${d.node} ${d.modifier}") cfg.allowedDevices;
};
inherit (config.nixpkgs) localSystem;
kernelVersion = config.boot.kernelPackages.kernel.version;
bindMountOpts = { name, ... }: {
@ -480,10 +479,13 @@ in
merge = loc: defs: (import "${toString config.nixpkgs}/nixos/lib/eval-config.nix" {
modules =
let
extraConfig = {
extraConfig = { options, ... }: {
_file = "module at ${__curPos.file}:${toString __curPos.line}";
config = {
nixpkgs = { inherit localSystem; };
nixpkgs = if options.nixpkgs?hostPlatform && host.options.nixpkgs.hostPlatform.isDefined
then { inherit (host.config.nixpkgs) hostPlatform; }
else { inherit (host.config.nixpkgs) localSystem; }
;
boot.isContainer = true;
networking.hostName = mkDefault name;
networking.useDHCP = false;