synchronize with trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
2011-11-08 10:18:35 +00:00
parent 91ab98ce09 d5a21a68e5
commit 368ac01473
70 changed files with 829 additions and 2299 deletions
@@ -77,7 +77,11 @@ stdenv.mkDerivation rec {

    license = "GPLv3+";

-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.gnu;
+    maintainers = with stdenv.lib.maintainers; [ ludo shlevy ];
+
+    platforms = if EFIsupport then
+      [ "i686-linux" "x86_64-linux" ]
+    else
+      stdenv.lib.platforms.gnu;
  };
 }