Merge branch 'staging'

Comparison looks OK; I'll try some fixes on master directly. http://hydra.nixos.org/eval/1372577?compare=1372497
2017-07-05 08:55:26 +02:00
parent f203b32bb8 c73f0caea5
commit 5328aac7be
80 changed files with 1344 additions and 3860 deletions
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

  buildInputs = stdenv.lib.optional doCheck ed;

-  configureFlags = if hostPlatform == buildPlatform then null else [
+  configureFlags = stdenv.lib.optionals (hostPlatform != buildPlatform) [
    "ac_cv_func_strnlen_working=yes"
  ];