diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2019-02-23 00:00:00 +0000 |
|---|---|---|
| committer | danbst <abcz2.uprola@gmail.com> | 2019-03-08 11:37:20 +0200 |
| commit | 83ae1ffed43f5dc54bcfd58655974293d215df6e (patch) | |
| tree | 55558ec1d2444341995889f3ebf9c4a5c563286c /pkgs/top-level/stage.nix | |
| parent | 5aa813dcc942d05485b89a89e734d231f31eaa9f (diff) | |
pkgs/top-level/stage.nix: don't override `overlays` and `config` in `nixpkgsFun`
`nixpkgsFun` already sets them via `args`. Doing this also introduces unexpected hard to debug errors, see the patch.
Diffstat (limited to 'pkgs/top-level/stage.nix')
| -rw-r--r-- | pkgs/top-level/stage.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 835a2883845ef..0ee5c25b0101b 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -135,7 +135,6 @@ let # default GNU libc on Linux systems. Non-Linux systems are not # supported. pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun { - inherit overlays config; ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { parsed = stdenv.hostPlatform.parsed // { @@ -152,7 +151,6 @@ let # All packages built for i686 Linux. # Used by wine, firefox with debugging version of Flash, ... pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then nixpkgsFun { - inherit overlays config; ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { parsed = stdenv.hostPlatform.parsed // { |