Merge commit staging+systemd into closure-size

Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
parent d6dd3b8bd1 33373d939a
commit 5227fb1dd5
6304 changed files with 708451 additions and 130034 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;