diff options
| -rw-r--r-- | nixos/lib/eval-config.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/misc/extra-arguments.nix | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 3e07df6c0860..a87b285c5b7b 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -54,11 +54,6 @@ in rec { # These are the extra arguments passed to every module. In # 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_ // { inherit modules baseModules; }; diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix index 02ac6e7a59dc..19002b17dace 100644 --- a/nixos/modules/misc/extra-arguments.nix +++ b/nixos/modules/misc/extra-arguments.nix @@ -4,6 +4,11 @@ _module.args = { pkgs_i686 = import ../../.. { 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; }; |