From 9d984837c9d7d5b1f3afe396cceaa526baf9682b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 29 Jan 2011 23:07:06 +0000
Subject: [PATCH] GNU: Disable GRUB by default on ARM.

svn path=/nixos/trunk/; revision=25719
---
 modules/config/gnu.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/config/gnu.nix b/modules/config/gnu.nix
index 70ddca668765..ddc1527285fe 100644
--- a/modules/config/gnu.nix
+++ b/modules/config/gnu.nix
@@ -19,13 +19,15 @@ with pkgs.lib;
     environment.systemPackages = with pkgs;
       # TODO: Adjust `requiredPackages' from `system-path.nix'.
       # TODO: Add Inetutils once it has the new `ifconfig'.
-      [ grub2 parted fdisk
+      [ parted fdisk
         nano zile
         texinfo # for the stand-alone Info reader
-      ];
+      ]
+      ++ stdenv.lib.optional !stdenv.isArm grub2;
 
-    # GNU GRUB.
-    boot.loader.grub.enable = true;
+
+    # GNU GRUB, where available.
+    boot.loader.grub.enable = !stdenv.isArm;
     boot.loader.grub.version = 2;
 
     # GNU lsh.