Merge pull request #58246 from danbst/infinite-recursion-otherPackageSets

pkgsMusl, pkgsi686Linux, pkgsStatic: fix infinite recursion with overlays

authored by

Matthew Bauer and committed by
GitHub
5f32434a 725b5499

+9
+9
pkgs/top-level/stage.nix
··· 135 # default GNU libc on Linux systems. Non-Linux systems are not 136 # supported. 137 pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun { 138 ${if stdenv.hostPlatform == stdenv.buildPlatform 139 then "localSystem" else "crossSystem"} = { 140 parsed = stdenv.hostPlatform.parsed // { ··· 151 # All packages built for i686 Linux. 152 # Used by wine, firefox with debugging version of Flash, ... 153 pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then nixpkgsFun { 154 ${if stdenv.hostPlatform == stdenv.buildPlatform 155 then "localSystem" else "crossSystem"} = { 156 parsed = stdenv.hostPlatform.parsed // { ··· 176 # Fully static packages. 177 # Currently uses Musl on Linux (couldn’t get static glibc to work). 178 pkgsStatic = nixpkgsFun ({ 179 crossOverlays = [ (import ./static.nix) ]; 180 } // lib.optionalAttrs stdenv.hostPlatform.isLinux { 181 crossSystem = {
··· 135 # default GNU libc on Linux systems. Non-Linux systems are not 136 # supported. 137 pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun { 138 + overlays = [ (self': super': { 139 + pkgsMusl = super'; 140 + })] ++ overlays; 141 ${if stdenv.hostPlatform == stdenv.buildPlatform 142 then "localSystem" else "crossSystem"} = { 143 parsed = stdenv.hostPlatform.parsed // { ··· 154 # All packages built for i686 Linux. 155 # Used by wine, firefox with debugging version of Flash, ... 156 pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then nixpkgsFun { 157 + overlays = [ (self': super': { 158 + pkgsi686Linux = super'; 159 + })] ++ overlays; 160 ${if stdenv.hostPlatform == stdenv.buildPlatform 161 then "localSystem" else "crossSystem"} = { 162 parsed = stdenv.hostPlatform.parsed // { ··· 182 # Fully static packages. 183 # Currently uses Musl on Linux (couldn’t get static glibc to work). 184 pkgsStatic = nixpkgsFun ({ 185 + overlays = [ (self': super': { 186 + pkgsStatic = super'; 187 + })] ++ overlays; 188 crossOverlays = [ (import ./static.nix) ]; 189 } // lib.optionalAttrs stdenv.hostPlatform.isLinux { 190 crossSystem = {