Merge pull request #231473 from B4dM4n/eval-config-pass-system

treewide: pass system argument to eval-config.nix
This commit is contained in:
Jörg Thalheim 2023-05-14 20:13:12 +01:00 committed by GitHub
commit 3007746b3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 0 deletions

View file

@ -515,6 +515,10 @@ in
in [ extraConfig ] ++ (map (x: x.value) defs);
prefix = [ "containers" name ];
inherit (config) specialArgs;
# The system is inherited from the host above.
# Set it to null, to remove the "legacy" entrypoint's non-hermetic default.
system = null;
}).config;
};
};

View file

@ -25,6 +25,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
system.stateVersion = "18.03";
};
};
# The system is inherited from the host above.
# Set it to null, to remove the "legacy" entrypoint's non-hermetic default.
system = null;
};
in with pkgs; [
stdenv stdenvNoCC emptyContainer.config.containers.foo.path

View file

@ -39030,6 +39030,10 @@ with pkgs;
then configuration
else [configuration]
);
# The system is inherited from the current pkgs above.
# Set it to null, to remove the "legacy" entrypoint's non-hermetic default.
system = null;
};
in
c.config.system.build // c;