diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-11-14 23:25:36 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-11-14 23:25:36 +0100 |
| commit | da76deffd176dd273524a9b8009dca5c58a58592 (patch) | |
| tree | 6ac3912d4b0afd6f35ab8ad8b7d4097c5f5fd990 /pkgs/development/tools/build-managers/meson | |
| parent | bca2e8255e4230398edd1f91ce45521d54d6122e (diff) | |
| parent | 2024d55020e5f34e9f1e41d54122264f246ea7c9 (diff) | |
| download | nixlib-da76deffd176dd273524a9b8009dca5c58a58592.tar nixlib-da76deffd176dd273524a9b8009dca5c58a58592.tar.gz nixlib-da76deffd176dd273524a9b8009dca5c58a58592.tar.bz2 nixlib-da76deffd176dd273524a9b8009dca5c58a58592.tar.lz nixlib-da76deffd176dd273524a9b8009dca5c58a58592.tar.xz nixlib-da76deffd176dd273524a9b8009dca5c58a58592.tar.zst nixlib-da76deffd176dd273524a9b8009dca5c58a58592.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/tools/build-managers/meson')
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index fad5bc9e630d..595d93327396 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,4 +1,11 @@ -{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }: +{ lib +, python3Packages +, fetchpatch +, stdenv +, writeTextDir +, substituteAll +, targetPackages +}: let # See https://mesonbuild.com/Reference-tables.html#cpu-families @@ -54,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 |