JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stage.nix: fix cross compiling with pkgsMusl

Browse Source 
Fixes #48265
This commit is contained in:
Matthew Bauer 2018-10-14 00:26:09 -05:00
parent 81593e39bc
commit 01dfe3f560
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/top-level/stage.nix
View File

@ -134,13 +134,16 @@ let
# default GNU libc on Linux systems. Non-Linux systems are not # default GNU libc on Linux systems. Non-Linux systems are not
# supported. # supported.
pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun { pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun {
localSystem = { inherit overlays config;
${if stdenv.hostPlatform == stdenv.buildPlatform
then "localSystem" else "crossSystem"} = {
parsed = stdenv.hostPlatform.parsed // { parsed = stdenv.hostPlatform.parsed // {
abi = { abi = {
"gnu" = lib.systems.parse.abis.musl; "gnu" = lib.systems.parse.abis.musl;
"gnueabi" = lib.systems.parse.abis.musleabi; "gnueabi" = lib.systems.parse.abis.musleabi;
"gnueabihf" = lib.systems.parse.abis.musleabihf; "gnueabihf" = lib.systems.parse.abis.musleabihf;
}.${stdenv.hostPlatform.parsed.abi.name} or lib.systems.parse.abis.musl; }.${stdenv.hostPlatform.parsed.abi.name}
or lib.systems.parse.abis.musl;
}; };
}; };
} else throw "Musl libc only supports Linux systems."; } else throw "Musl libc only supports Linux systems.";
@ -148,7 +151,9 @@ let
# All packages built for i686 Linux. # All packages built for i686 Linux.
# Used by wine, firefox with debugging version of Flash, ... # Used by wine, firefox with debugging version of Flash, ...
pkgsi686Linux = assert stdenv.hostPlatform.isLinux; nixpkgsFun { pkgsi686Linux = assert stdenv.hostPlatform.isLinux; nixpkgsFun {
localSystem = { inherit overlays config;
${if stdenv.hostPlatform == stdenv.buildPlatform
then "localSystem" else "crossSystem"} = {
parsed = stdenv.hostPlatform.parsed // { parsed = stdenv.hostPlatform.parsed // {
cpu = lib.systems.parse.cpuTypes.i686; cpu = lib.systems.parse.cpuTypes.i686;
}; };