diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-03-25 12:05:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-25 12:05:07 -0400 |
| commit | 5f32434aef87dc19d320b963054f844f1a88701c (patch) | |
| tree | 86def62a63d6b0824afdccfc117057ae2b01e227 | |
| parent | 725b5499b89fe80d7cfbb00bd3c140a73cbdd97f (diff) | |
| parent | f72903864d5e2be87bb532a516ee8d52c034a9fc (diff) | |
Merge pull request #58246 from danbst/infinite-recursion-otherPackageSets
pkgsMusl, pkgsi686Linux, pkgsStatic: fix infinite recursion with overlays
| -rw-r--r-- | pkgs/top-level/stage.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 0ee5c25b0101b..357ca5246c934 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -135,6 +135,9 @@ let # default GNU libc on Linux systems. Non-Linux systems are not # supported. pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun { + overlays = [ (self': super': { + pkgsMusl = super'; + })] ++ overlays; ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { parsed = stdenv.hostPlatform.parsed // { @@ -151,6 +154,9 @@ 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 { + overlays = [ (self': super': { + pkgsi686Linux = super'; + })] ++ overlays; ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { parsed = stdenv.hostPlatform.parsed // { @@ -176,6 +182,9 @@ let # Fully static packages. # Currently uses Musl on Linux (couldn’t get static glibc to work). pkgsStatic = nixpkgsFun ({ + overlays = [ (self': super': { + pkgsStatic = super'; + })] ++ overlays; crossOverlays = [ (import ./static.nix) ]; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { crossSystem = { |