Merge master into staging-next

2018-11-10 11:08:54 +01:00
parent 322f87137c 40c567de0f
commit 53d00c3351
540 changed files with 11238 additions and 7081 deletions
@@ -185,6 +185,8 @@ stdenv.mkDerivation ({

  inherit patches;

+  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+
  outputs = if langJava || langGo then ["out" "man" "info"]
    else [ "out" "lib" "man" "info" ];
  setOutputFlags = false;
@@ -192,8 +194,6 @@ stdenv.mkDerivation ({

  libc_dev = stdenv.cc.libc_dev;

-  hardeningDisable = [ "format" ];
-
  postPatch =
    if targetPlatform != hostPlatform || stdenv.cc.libc != null then
      # On NixOS, use the right path to the dynamic linker instead of