Merge remote-tracking branch 'upstream/master' into stdenv-updates

2013-01-20 16:53:21 +01:00
parent d1c548cdd7 e185691ced
commit 1886d1db6a
41 changed files with 537 additions and 127 deletions
@@ -36,6 +36,6 @@ stdenv.mkDerivation {
    homepage = http://www.naev.org;
    license = "GPLv3+";
    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    #platforms = stdenv.lib.platforms.linux;
  };
 }