Merge master into staging-next

2021-02-11 18:16:48 +00:00
parent 1af73c223c bde46aca9e
commit 402b752521
35 changed files with 200 additions and 139 deletions
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
  cmakeFlags = [
    "-DBUILD_SHARED_LIBS=ON"
    "-DENABLE_TESTS=OFF"
+  ] ++ lib.optionals stdenv.isDarwin [
+    # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build:
+    "-DCONFIG_RUNTIME_CPU_DETECT=OFF"
  ];

  postFixup = ''