Merge 'master' into staging

2015-05-24 20:39:58 +02:00
parent cdd93463c0 c505b8ac28
commit f83d12a382
707 changed files with 16060 additions and 13246 deletions
@@ -8,7 +8,7 @@
 , withGd ? false, gd ? null, libpng ? null
 }:

-assert stdenv.cc.cc.isGNU or false;
+assert stdenv.cc.isGNU;

 let
  build = import ./common.nix;