Merge master into staging-next

2021-05-16 01:00:58 +00:00
parent f1b78f8618 8ceb0380a2
commit b484cef365
41 changed files with 3677 additions and 198 deletions
@@ -9,11 +9,13 @@ stdenv.mkDerivation rec {
    sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs";
  };

-  NIX_CFLAGS_COMPILE = builtins.toString [
-    "-Wno-error=format-truncation"
-    "-Wno-error=deprecated-declarations"
-    "-Wno-error=stringop-overflow"
-  ];
+  NIX_CFLAGS_COMPILE = builtins.toString (
+    [ "-Wno-error=deprecated-declarations" ]
+      ++ lib.optionals (!stdenv.cc.isClang) [
+        "-Wno-error=format-truncation"
+        "-Wno-error=stringop-overflow"
+      ]
+  );

  buildInputs = [ openssl ];