diff options
| author | John Ericson <git@JohnEricson.me> | 2020-08-31 20:00:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 20:00:15 -0400 |
| commit | 5a05601013407fc755d1d0d4f6385a9c14b3125a (patch) | |
| tree | 848d802e7c63053d373e6e8ec048d511f65aae80 | |
| parent | d56da56bf886cd738c979a5b6d72487552d7f115 (diff) | |
| parent | 55195119d529d65e264bcae9ce2741827272efb4 (diff) | |
Merge pull request #96223 from KAction/static
Make pkgsStatic set "static" argument to true
| -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 c929781dd8ff..09884d406823 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 9e07d2bf0614..58b0300cc79c 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; |