Unverified Commit df4084e1 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #218219: pkgsMusl: disable for i686-linux

parents 571650c7 89bf849a

pkgs/top-level/stage.nix

+3 −3
Original line number Diff line number Diff line
@@ -199,8 +199,8 @@ let 


    # All packages built with the Musl libc. This will override the

    # default GNU libc on Linux systems. Non-Linux systems are not

    # supported.

    pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun {

    # supported. 32-bit is also not supported.

    pkgsMusl = if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then nixpkgsFun {

      overlays = [ (self': super': {

        pkgsMusl = super';

      })] ++ overlays;
@@ -208,7 +208,7 @@ let 
        then "localSystem" else "crossSystem"} = {

        parsed = makeMuslParsedPlatform stdenv.hostPlatform.parsed;

      };

    } else throw "Musl libc only supports Linux systems.";

    } else throw "Musl libc only supports 64-bit Linux systems.";



    # All packages built for i686 Linux.

    # Used by wine, firefox with debugging version of Flash, ...