diff options
| author | davidak <git@davidak.de> | 2023-02-25 12:09:57 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-03-04 13:02:27 +0000 |
| commit | 343c90a41135b8234add1348affc0baa3b4a6e71 (patch) | |
| tree | b2ac71997c9c2c07c4dcfe8c3e104203d23831d8 | |
| parent | Merge pull request #218420 from mweinelt/22.11/mglru (diff) | |
| download | nixpkgs-343c90a41135b8234add1348affc0baa3b4a6e71.tar.gz | |
pkgsMusl: disable for i686-linux
there are no bootstrap binaries for 32-bit musl libc
(cherry picked from commit 89bf849a27917ec745af3a79a3b58b835fddaad5)
| -rw-r--r-- | pkgs/top-level/stage.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 3669b622e715..419493816844 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -207,8 +207,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; @@ -216,7 +216,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, ... |