Merge branch 'master' into staging

A few thousand rebuilds from master, again.
Hydra: ?compare=1422362
This commit is contained in:
Vladimír Čunát
2017-12-31 09:53:49 +01:00
46 changed files with 2019 additions and 368 deletions
+1 -1
View File
@@ -293,7 +293,7 @@ stdenv.mkDerivation {
## Hardening support
##
export hardening_unsupported_flags=""
export hardening_unsupported_flags="${builtins.concatStringsSep " " (cc.hardeningUnsupportedFlags or [])}"
''
+ optionalString hostPlatform.isCygwin ''