diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2018-11-04 21:33:16 +0100 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2018-11-04 21:33:16 +0100 |
| commit | 51c6f51390ba3c0bfefc1bf8437cb265c92395f4 (patch) | |
| tree | f6ee5a97d98eea816aa8c862251db6a25b69294b /nixos/modules/misc/nixpkgs.nix | |
| parent | 03fc1167e87b16a736d6daedada33d2b0c75f62c (diff) | |
| parent | 14a9365952fcac6214b78a3b1f553961ad2f0a69 (diff) | |
| download | nixlib-51c6f51390ba3c0bfefc1bf8437cb265c92395f4.tar nixlib-51c6f51390ba3c0bfefc1bf8437cb265c92395f4.tar.gz nixlib-51c6f51390ba3c0bfefc1bf8437cb265c92395f4.tar.bz2 nixlib-51c6f51390ba3c0bfefc1bf8437cb265c92395f4.tar.lz nixlib-51c6f51390ba3c0bfefc1bf8437cb265c92395f4.tar.xz nixlib-51c6f51390ba3c0bfefc1bf8437cb265c92395f4.tar.zst nixlib-51c6f51390ba3c0bfefc1bf8437cb265c92395f4.zip | |
Merge remote-tracking branch 'upstream/master' into nixos-nixpkgs-pkgs-use-overlays
Diffstat (limited to 'nixos/modules/misc/nixpkgs.nix')
| -rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 81556c419bd7..461a3b68ed61 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -217,7 +217,6 @@ in config = { _module.args = { pkgs = finalPkgs; - pkgs_i686 = finalPkgs.pkgsi686Linux; }; }; } |