diff options
author | Shea Levy <shea@shealevy.com> | 2013-12-31 21:34:44 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2013-12-31 21:34:44 -0500 |
commit | 58246936e4f44c744e08e2386d4c446d18a44b24 (patch) | |
tree | 8ab1ec7403d948ed85a66901955438831179d0bd /pkgs/top-level/platforms.nix | |
parent | af9db522cf7053797f5d0729698cfafe47aac9be (diff) | |
download | nixlib-58246936e4f44c744e08e2386d4c446d18a44b24.tar nixlib-58246936e4f44c744e08e2386d4c446d18a44b24.tar.gz nixlib-58246936e4f44c744e08e2386d4c446d18a44b24.tar.bz2 nixlib-58246936e4f44c744e08e2386d4c446d18a44b24.tar.lz nixlib-58246936e4f44c744e08e2386d4c446d18a44b24.tar.xz nixlib-58246936e4f44c744e08e2386d4c446d18a44b24.tar.zst nixlib-58246936e4f44c744e08e2386d4c446d18a44b24.zip |
platforms.nix: Separate 32-bit and 64-bit PCs
With this, stdenv.platform.kernelArch can be used by the kernel builder for PC platforms too. Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs/top-level/platforms.nix')
-rw-r--r-- | pkgs/top-level/platforms.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index d6408286581d..299941790e93 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -1,5 +1,5 @@ rec { - pc = { + pcBase = { name = "pc"; uboot = null; kernelHeadersBaseConfig = "defconfig"; @@ -7,12 +7,17 @@ rec { # Build whatever possible as a module, if not stated in the extra config. kernelAutoModules = true; kernelTarget = "bzImage"; - # Currently ignored - it should be set according to 'system' once it is - # not ignored. This is for stdenv-updates. - kernelArch = "i386"; }; - pc_simplekernel = pc // { + pc64 = pcBase // { kernelArch = "x86_64"; }; + + pc32 = pcBase // { kernelArch = "i386"; }; + + pc32_simplekernel = pc32 // { + kernelAutoModules = false; + }; + + pc64_simplekernel = pc64 // { kernelAutoModules = false; }; |