git.iko.soy/typeable/nixpkgs
on master help sign in
meson: fix unknown compiler error
commit3108c4dd15f76b0bb38caa9a24e0c41f0a036fc9 authorJan Tojnar <jtojnar@gmail.com> dateThu 14 Nov 2019, 22:35 (7 years ago) parentc32ecb4
1 file changed+16−1
pkgs/development/tools/build-managers/meson/default.nix+16−1
pkgs/development/tools/build-managers/meson/default.nix+16−1
@@ -1,4 +1,11 @@
1−{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }:
1+{ lib
2+, python3Packages
3+, fetchpatch
4+, stdenv
5+, writeTextDir
6+, substituteAll
7+, targetPackages
8+}:
29
310let
411 # See https://mesonbuild.com/Reference-tables.html#cpu-families
@@ -54,6 +61,14 @@ python3Packages.buildPythonApplication rec {
5461 src = ./fix-rpath.patch;
5562 inherit (builtins) storeDir;
5663 })
64+
65+ # Fix detecting incorrect compiler in the store path hash.
66+ # https://github.com/NixOS/nixpkgs/issues/73417#issuecomment-554077964
67+ # https://github.com/mesonbuild/meson/pull/6185
68+ (fetchpatch {
69+ url = "https://github.com/mesonbuild/meson/commit/972ede1d14fdf17fe5bb8fb99be220f9395c2392.patch";
70+ sha256 = "19bfsylhpy0b2xv3ks8ac9x3q6vvvyj1wjcy971v9d5f1455xhbb";
71+ })
5772 ] ++ lib.optionals stdenv.isDarwin [
5873 # We use custom Clang, which makes Meson think *not Apple*, while still
5974 # relying on system linker. When it detects standard Clang, Meson will