diff options
| author | Dmitry Bogatov <KAction@disroot.org> | 2020-08-24 21:46:48 -0400 |
|---|---|---|
| committer | Dmitry Bogatov <KAction@disroot.org> | 2020-08-27 18:36:34 -0400 |
| commit | 55195119d529d65e264bcae9ce2741827272efb4 (patch) | |
| tree | f75aa9ef94ab67d30abbe74bfcbd4a97fe583060 | |
| parent | 0fa82116835b07f958755c29ef30706eebdde66b (diff) | |
Distinguish pkgsStatic from pkgsMusl via stdenv.targetPlatform
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.
| -rw-r--r-- | lib/systems/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/stage.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index c929781dd8ff9..09884d4068239 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -76,6 +76,7 @@ rec { # uname -r release = null; }; + isStatic = final.isWasm || final.isRedox; kernelArch = if final.isAarch32 then "arm" diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 9e07d2bf06146..58b0300cc79ce 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -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; |