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

Merge pull request #96223 from KAction/static 

Make pkgsStatic set "static" argument to true
This commit is contained in:
John Ericson 2020-08-31 20:00:15 -04:00 committed by GitHub
parent d56da56bf8 55195119d5
commit 5a05601013
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/systems/default.nix
View File

@ -76,6 +76,7 @@ rec {
# uname -r # uname -r
release = null; release = null;
}; };
isStatic = final.isWasm || final.isRedox;
kernelArch = kernelArch =
if final.isAarch32 then "arm" if final.isAarch32 then "arm"

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

@ -215,6 +215,7 @@ let
crossOverlays = [ (import ./static.nix) ]; crossOverlays = [ (import ./static.nix) ];
} // lib.optionalAttrs stdenv.hostPlatform.isLinux { } // lib.optionalAttrs stdenv.hostPlatform.isLinux {
crossSystem = { crossSystem = {
isStatic = true;
parsed = stdenv.hostPlatform.parsed // { parsed = stdenv.hostPlatform.parsed // {
abi = { abi = {
gnu = lib.systems.parse.abis.musl; gnu = lib.systems.parse.abis.musl;