Skip to content

Commit 3daea5f

Browse files
committed
nixos-containers: Make sure same version of nixos-container is used
Fixes #185126 (I hope)
1 parent f559532 commit 3daea5f

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

nixos/modules/virtualisation/nixos-containers.nix

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ let
99
configurationDirectory = "/etc/${configurationDirectoryName}";
1010
stateDirectory = "/var/lib/${configurationPrefix}containers";
1111

12+
nixos-container = pkgs.nixos-container.override {
13+
inherit stateDirectory configurationDirectory;
14+
};
15+
1216
# The container's init script, a small wrapper around the regular
1317
# NixOS stage-2 init script.
1418
containerInit = (cfg:
@@ -248,7 +252,7 @@ let
248252
ExecReload = pkgs.writeScript "reload-container"
249253
''
250254
#! ${pkgs.runtimeShell} -e
251-
${pkgs.nixos-container}/bin/nixos-container run "$INSTANCE" -- \
255+
${nixos-container}/bin/nixos-container run "$INSTANCE" -- \
252256
bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test"
253257
'';
254258

@@ -866,9 +870,7 @@ in
866870
'';
867871

868872
environment.systemPackages = [
869-
(pkgs.nixos-container.override {
870-
inherit stateDirectory configurationDirectory;
871-
})
873+
nixos-container
872874
];
873875

874876
boot.kernelModules = [

0 commit comments

Comments
 (0)