diff options
author | John Ericson <git@JohnEricson.me> | 2019-09-02 01:38:22 -0400 |
---|---|---|
committer | John Ericson <git@JohnEricson.me> | 2019-09-02 01:38:22 -0400 |
commit | 3d8cf087068c4d2f011d06d11453e3dd966da321 (patch) | |
tree | 847ff51fec880cdacc23054a8bf4f8f83b936e93 /lib/systems | |
parent | 446f8c851d599326373a2c910841d092ff8e68ae (diff) |
lib: Sort platform predicates
Diffstat (limited to 'lib/systems')
-rw-r--r-- | lib/systems/inspect.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index bf186126d4a..b099ca0ad71 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -21,6 +21,7 @@ rec { isSparc = { cpu = { family = "sparc"; }; }; isWasm = { cpu = { family = "wasm"; }; }; isAvr = { cpu = { family = "avr"; }; }; + isJavaScript = { cpu = cpuTypes.js; }; is32bit = { cpu = { bits = 32; }; }; is64bit = { cpu = { bits = 64; }; }; @@ -41,6 +42,7 @@ rec { isWindows = { kernel = kernels.windows; }; isCygwin = { kernel = kernels.windows; abi = abis.cygnus; }; isMinGW = { kernel = kernels.windows; abi = abis.gnu; }; + isGhcjs = { kernel = kernels.ghcjs; }; isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; @@ -49,8 +51,6 @@ rec { isEfi = map (family: { cpu.family = family; }) [ "x86" "arm" "aarch64" ]; - isJavaScript = { cpu = cpuTypes.js; }; - isGhcjs = { kernel = kernels.ghcjs; }; # Deprecated after 18.03 isArm = isAarch32; }; |