Merge branch 'staging' into staging-next

2019-12-31 03:59:58 +01:00
parent d6136b744a c5406e30b0
commit 0c2adc0fb1
352 changed files with 639 additions and 837 deletions
@@ -34,13 +34,13 @@ stdenv.mkDerivation rec {
    "--enable-remote-bitbang"
  ];

-  NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
+  NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [
    "-Wno-implicit-fallthrough"
    "-Wno-format-truncation"
    "-Wno-format-overflow"
    "-Wno-error=tautological-compare"
    "-Wno-error=array-bounds"
-  ];
+  ]);

  postInstall = lib.optionalString stdenv.isLinux ''
    mkdir -p "$out/etc/udev/rules.d"