Merge branch 'staging-next' into staging

2019-11-14 23:25:55 +01:00
parent 21f3586b03 da76deffd1
commit 94d4fe8546
259 changed files with 6900 additions and 4363 deletions
@@ -61,6 +61,14 @@ python3Packages.buildPythonApplication rec {
      src = ./fix-rpath.patch;
      inherit (builtins) storeDir;
    })
+
+    # Fix detecting incorrect compiler in the store path hash.
+    # https://github.com/NixOS/nixpkgs/issues/73417#issuecomment-554077964
+    # https://github.com/mesonbuild/meson/pull/6185
+    (fetchpatch {
+      url = "https://github.com/mesonbuild/meson/commit/972ede1d14fdf17fe5bb8fb99be220f9395c2392.patch";
+      sha256 = "19bfsylhpy0b2xv3ks8ac9x3q6vvvyj1wjcy971v9d5f1455xhbb";
+    })
  ] ++ lib.optionals stdenv.isDarwin [
    # We use custom Clang, which makes Meson think *not Apple*, while still
    # relying on system linker. When it detects standard Clang, Meson will