nixos: move left-behind allowUnfree comment
This commit is contained in:
parent
08094aa879
commit
e87fa04ddc
|
@ -54,11 +54,6 @@ in rec {
|
||||||
|
|
||||||
# These are the extra arguments passed to every module. In
|
# These are the extra arguments passed to every module. In
|
||||||
# particular, Nixpkgs is passed through the "pkgs" argument.
|
# particular, Nixpkgs is passed through the "pkgs" argument.
|
||||||
# FIXME: we enable config.allowUnfree to make packages like
|
|
||||||
# nvidia-x11 available. This isn't a problem because if the user has
|
|
||||||
# ‘nixpkgs.config.allowUnfree = false’, then evaluation will fail on
|
|
||||||
# the 64-bit package anyway. However, it would be cleaner to respect
|
|
||||||
# nixpkgs.config here.
|
|
||||||
extraArgs = extraArgs_ // {
|
extraArgs = extraArgs_ // {
|
||||||
inherit modules baseModules;
|
inherit modules baseModules;
|
||||||
};
|
};
|
||||||
|
|
|
@ -4,6 +4,11 @@
|
||||||
_module.args = {
|
_module.args = {
|
||||||
pkgs_i686 = import ../../.. {
|
pkgs_i686 = import ../../.. {
|
||||||
system = "i686-linux";
|
system = "i686-linux";
|
||||||
|
# FIXME: we enable config.allowUnfree to make packages like
|
||||||
|
# nvidia-x11 available. This isn't a problem because if the user has
|
||||||
|
# ‘nixpkgs.config.allowUnfree = false’, then evaluation will fail on
|
||||||
|
# the 64-bit package anyway. However, it would be cleaner to respect
|
||||||
|
# nixpkgs.config here.
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue