diff options
author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-09-03 01:16:41 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-09-03 01:17:10 +0200 |
commit | e87fa04ddc78c667e99eb6662f3de575279fea08 (patch) | |
tree | ace620908e955cbb60bb09e0004ba34feaf279fc | |
parent | 08094aa8799e859934b18044bb4876ea8329b5b3 (diff) | |
download | nixpkgs-e87fa04ddc78c667e99eb6662f3de575279fea08.tar nixpkgs-e87fa04ddc78c667e99eb6662f3de575279fea08.tar.gz nixpkgs-e87fa04ddc78c667e99eb6662f3de575279fea08.tar.bz2 nixpkgs-e87fa04ddc78c667e99eb6662f3de575279fea08.tar.lz nixpkgs-e87fa04ddc78c667e99eb6662f3de575279fea08.tar.xz nixpkgs-e87fa04ddc78c667e99eb6662f3de575279fea08.tar.zst nixpkgs-e87fa04ddc78c667e99eb6662f3de575279fea08.zip |
nixos: move left-behind allowUnfree comment
-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 3e07df6c086..a87b285c5b7 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 02ac6e7a59d..19002b17dac 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; }; |