diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-10 11:24:06 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-10 11:24:35 -0400 |
commit | 5c4fa41d2aa1c1203a65ce47fbb5e5891ca36876 (patch) | |
tree | 53b5501a91c6d4db00593a431189064f210688f1 /lib | |
parent | bfb7ef86f3f2417b6866c704b7423c33bc33286c (diff) | |
parent | 02464668c09a3d9c8e419df913a87a84a57ce1e7 (diff) | |
download | nixlib-5c4fa41d2aa1c1203a65ce47fbb5e5891ca36876.tar nixlib-5c4fa41d2aa1c1203a65ce47fbb5e5891ca36876.tar.gz nixlib-5c4fa41d2aa1c1203a65ce47fbb5e5891ca36876.tar.bz2 nixlib-5c4fa41d2aa1c1203a65ce47fbb5e5891ca36876.tar.lz nixlib-5c4fa41d2aa1c1203a65ce47fbb5e5891ca36876.tar.xz nixlib-5c4fa41d2aa1c1203a65ce47fbb5e5891ca36876.tar.zst nixlib-5c4fa41d2aa1c1203a65ce47fbb5e5891ca36876.zip |
Merge a lib change into staging
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"; |