Merge staging-next into staging

2020-07-30 18:28:15 +02:00
parent 5d6aa8b496 ca63714c0f
commit cee7df4846
180 changed files with 1011 additions and 920 deletions
@@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
    # gcc together as compilers and we need clang for the sources generation.
    # However, clang emits tons of warnings about gcc's atomic-base library.
    "-DCMAKE_CXX_FLAGS=-Wno-braced-scalar-init"
-  ];
+  ] ++ lib.optional stdenv.isDarwin "-DCMAKE_FIND_FRAMEWORK=LAST";

  fixupPhase = ''
    wrapProgram $out/bin/oz --set OZEMACS ${emacs}/bin/emacs