diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-11-14 22:35:02 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-11-14 22:54:37 +0100 |
| commit | 3108c4dd15f76b0bb38caa9a24e0c41f0a036fc9 (patch) | |
| tree | 1f5ee3a2d1ccef3243d8a47ad1f2dbe38890e2d6 /pkgs/development/tools/build-managers/meson | |
| parent | c32ecb4b0efb2c5bda7a26f8b30e8dff82e7bddc (diff) | |
| download | nixpkgs-3108c4dd15f76b0bb38caa9a24e0c41f0a036fc9.tar nixpkgs-3108c4dd15f76b0bb38caa9a24e0c41f0a036fc9.tar.gz nixpkgs-3108c4dd15f76b0bb38caa9a24e0c41f0a036fc9.tar.bz2 nixpkgs-3108c4dd15f76b0bb38caa9a24e0c41f0a036fc9.tar.lz nixpkgs-3108c4dd15f76b0bb38caa9a24e0c41f0a036fc9.tar.xz nixpkgs-3108c4dd15f76b0bb38caa9a24e0c41f0a036fc9.tar.zst nixpkgs-3108c4dd15f76b0bb38caa9a24e0c41f0a036fc9.zip | |
meson: fix unknown compiler error
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 fad5bc9e630..595d9332739 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 |