Merge staging-next into staging

2021-02-12 12:20:24 +00:00
parent 53a0c2878b 15db604744
commit 53c1035b44
19 changed files with 121 additions and 115 deletions
@@ -32,9 +32,9 @@ stdenv.mkDerivation rec {
  cmakeFlags = [
    "-DBUILD_SHARED_LIBS=ON"
    "-DENABLE_TESTS=OFF"
-  ] ++ lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
    # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build:
-    "-DCONFIG_RUNTIME_CPU_DETECT=OFF"
+    "-DCONFIG_RUNTIME_CPU_DETECT=0"
  ];

  postFixup = ''