Merge staging-next into staging

2021-04-30 12:26:14 +00:00
parent 6cba9af2c9 450d9147e7
commit d7882499f8
59 changed files with 741 additions and 642 deletions
@@ -67,6 +67,7 @@ stdenv.mkDerivation rec {
      R_SHELL="${stdenv.shell}"
  '' + lib.optionalString stdenv.isDarwin ''
      --disable-R-framework
+      --without-x
      OBJC="clang"
      CPPFLAGS="-isystem ${libcxx}/include/c++/v1"
      LDFLAGS="-L${libcxx}/lib"