diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-09 00:09:31 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-09 00:09:31 +0200 |
| commit | e09250d41ccaf65c570ba94c0335493365807770 (patch) | |
| tree | d2e84f9bd9d026d296da337528752685376c1eb9 /nixos/lib/eval-config.nix | |
| parent | dcd0e68b177954278a767e55e63e80260daa3ea0 (diff) | |
| download | nixpkgs-e09250d41ccaf65c570ba94c0335493365807770.tar nixpkgs-e09250d41ccaf65c570ba94c0335493365807770.tar.gz nixpkgs-e09250d41ccaf65c570ba94c0335493365807770.tar.bz2 nixpkgs-e09250d41ccaf65c570ba94c0335493365807770.tar.lz nixpkgs-e09250d41ccaf65c570ba94c0335493365807770.tar.xz nixpkgs-e09250d41ccaf65c570ba94c0335493365807770.tar.zst nixpkgs-e09250d41ccaf65c570ba94c0335493365807770.zip | |
Disable allowUnfree by default
Fixes #2134.
Diffstat (limited to 'nixos/lib/eval-config.nix')
| -rw-r--r-- | nixos/lib/eval-config.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 4b8c7354a7e..e082b174454 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -26,10 +26,15 @@ 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 pkgs modules baseModules; modulesPath = ../modules; - pkgs_i686 = import ./nixpkgs.nix { system = "i686-linux"; }; + pkgs_i686 = import ./nixpkgs.nix { system = "i686-linux"; config.allowUnfree = true; }; utils = import ./utils.nix pkgs; }; |