mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 00:10:30 +00:00
Code Issues Wiki Activity

meson: fix unknown compiler error

Browse source
This commit is contained in:
Jan Tojnar 2019-11-14 22:35:02 +01:00
parent c32ecb4b0e
commit 3108c4dd15
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/tools/build-managers/meson/default.nix
View file

@ -1,4 +1,11 @@
{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }: { lib
, python3Packages
, fetchpatch
, stdenv
, writeTextDir
, substituteAll
, targetPackages
}:
let let
# See https://mesonbuild.com/Reference-tables.html#cpu-families # See https://mesonbuild.com/Reference-tables.html#cpu-families
@ -54,6 +61,14 @@ python3Packages.buildPythonApplication rec {
src = ./fix-rpath.patch; src = ./fix-rpath.patch;
inherit (builtins) storeDir; 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 [ ] ++ lib.optionals stdenv.isDarwin [
# We use custom Clang, which makes Meson think *not Apple*, while still # We use custom Clang, which makes Meson think *not Apple*, while still
# relying on system linker. When it detects standard Clang, Meson will # relying on system linker. When it detects standard Clang, Meson will