diff options
author | John Ericson <Ericson2314@yahoo.com> | 2017-07-10 11:16:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-10 11:16:41 -0400 |
commit | 5059b6307aaae068f0354d1e1e9b5a3c5f7009c4 (patch) | |
tree | 0701ae4c2511b08f957061c50da2e68da2ea40e8 /lib | |
parent | 08743fe0a31c788d45143e23406777d65535633f (diff) | |
parent | 02464668c09a3d9c8e419df913a87a84a57ce1e7 (diff) |
Merge pull request #27281 from obsidiansystems/lib-powerpc
lib: Add isPowerPC predicate, and fix family name
Diffstat (limited to 'lib')
-rw-r--r-- | lib/systems/inspect.nix | 1 | ||||
-rw-r--r-- | lib/systems/parse.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 8228705272e7..a81e88989c0a 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -8,6 +8,7 @@ rec { "64bit" = { cpu = { bits = 64; }; }; i686 = { cpu = cpuTypes.i686; }; x86_64 = { cpu = cpuTypes.x86_64; }; + PowerPC = { cpu = cpuTypes.powerpc; }; x86 = { cpu = { family = "x86"; }; }; Arm = { cpu = { family = "arm"; }; }; Mips = { cpu = { family = "mips"; }; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index bf21d74b931d..befe90f9abeb 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -44,7 +44,7 @@ rec { i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; }; - powerpc = { bits = 32; significantByte = bigEndian; family = "powerpc"; }; + powerpc = { bits = 32; significantByte = bigEndian; family = "power"; }; }; isVendor = isType "vendor"; |