Merge master into staging-next

2021-05-15 18:30:28 +00:00
parent 665732d877 059c4b584e
commit f1b78f8618
43 changed files with 928 additions and 316 deletions
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
  ] ++ optional stdenv.isLinux libseccomp
    ++ optional stdenv.isDarwin gtk-mac-integration;

-  doCheck = true;
+  doCheck = !stdenv.isDarwin;

  meta = {
    homepage = "https://git.pwmt.org/pwmt/zathura";