Skip to content

Commit

Permalink
Distinguish pkgsStatic from pkgsMusl via stdenv.targetPlatform
Browse files Browse the repository at this point in the history
This change allows derivations to distinguish dynamic musl build and
static musl build in cases where upstream build system can't detect it
by itself.
  • Loading branch information
KAction committed Aug 27, 2020
1 parent 0fa8211 commit 5519511
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions lib/systems/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ rec {
# uname -r
release = null;
};
isStatic = final.isWasm || final.isRedox;

kernelArch =
if final.isAarch32 then "arm"
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/stage.nix
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ let
crossOverlays = [ (import ./static.nix) ];
} // lib.optionalAttrs stdenv.hostPlatform.isLinux {
crossSystem = {
isStatic = true;
parsed = stdenv.hostPlatform.parsed // {
abi = {
gnu = lib.systems.parse.abis.musl;
Expand Down

0 comments on commit 5519511

Please sign in to comment.