Merge master into staging-next

2021-03-11 06:18:03 +00:00
parent 0a8ec23e51 e641756799
commit 31dc9fe457
44 changed files with 171 additions and 150 deletions
@@ -60,5 +60,7 @@ stdenv.mkDerivation rec {
    license = licenses.gpl3Plus;
    platforms = platforms.unix;
    maintainers = [ maintainers.babariviere ];
+    # ld: symbol(s) not found for architecture x86_64
+    broken = stdenv.isDarwin;
  };
 }