From 6a848de95d9e74642efe1488b89a0fc53e8a5256 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sun, 19 Sep 2021 21:56:56 +0200 Subject: [PATCH] stdenv: add llvm-config to meson cross file This is e.g. required to get mesa cross-compiling, but is useful for everyone depending on libllvm --- pkgs/stdenv/generic/make-derivation.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 56cfa0c503f8..8fa306370494 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -305,6 +305,9 @@ else let cpu_family = '${cpuFamily stdenv.targetPlatform}' cpu = '${stdenv.targetPlatform.parsed.cpu.name}' endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} + + [binaries] + llvm-config = 'llvm-config-native' ''; in [ "--cross-file=${crossFile}" ] ++ mesonFlags; } // lib.optionalAttrs (attrs.enableParallelBuilding or false) {