diff options
| author | John Ericson <git@JohnEricson.me> | 2021-10-14 10:36:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-14 10:36:28 -0400 |
| commit | c3c77ae81271cce85e0117a1dd316fdcf94be74b (patch) | |
| tree | 412362a18abd0cfd7455d003d9c944ffc1d6f3c9 /pkgs | |
| parent | 517b471539df74c472bad54eb709028cd7b0e6db (diff) | |
| parent | 5d30f708b952a5f86a5df33468a03ce4dff59b24 (diff) | |
| download | nixpkgs-c3c77ae81271cce85e0117a1dd316fdcf94be74b.tar nixpkgs-c3c77ae81271cce85e0117a1dd316fdcf94be74b.tar.gz nixpkgs-c3c77ae81271cce85e0117a1dd316fdcf94be74b.tar.bz2 nixpkgs-c3c77ae81271cce85e0117a1dd316fdcf94be74b.tar.lz nixpkgs-c3c77ae81271cce85e0117a1dd316fdcf94be74b.tar.xz nixpkgs-c3c77ae81271cce85e0117a1dd316fdcf94be74b.tar.zst nixpkgs-c3c77ae81271cce85e0117a1dd316fdcf94be74b.zip | |
Merge pull request #138569 from Mindavi/mesa/cross
mesa (+stdenv / meson): fix cross-compilation support w/ llvm
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1d7b73a5419..035ff3b6e9c 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -93,6 +93,10 @@ self = stdenv.mkDerivation { ++ lib.optional stdenv.isLinux "driversdev" ++ lib.optional enableOpenCL "opencl"; + preConfigure = '' + PATH=${llvmPackages.libllvm.dev}/bin:$PATH + ''; + # TODO: Figure out how to enable opencl without having a runtime dependency on clang mesonFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 56cfa0c503f..8fa30637049 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) { |