diff options
| author | K900 <me@0upti.me> | 2024-02-21 19:10:55 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2024-02-21 19:10:55 +0300 |
| commit | 9604fee65a7826e29fa1f06ab897395f11022ab2 (patch) | |
| tree | 224e02fd2be8ce55d7b17e57beb9787e75c9f412 /pkgs/development/libraries/mesa | |
| parent | e98fe116d8678612e73968b5e944e8523caa5983 (diff) | |
mesa: fix build on x86_64-darwin
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 466b70cb71f75..dff2f0021d468 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -255,7 +255,13 @@ self = stdenv.mkDerivation { ++ lib.optional haveZink vulkan-loader ++ lib.optional haveDozen directx-headers; - depsBuildBuild = [ pkg-config buildPackages.stdenv.cc ]; + depsBuildBuild = [ pkg-config ] + # Adding this unconditionally makes x86_64-darwin pick up an older toolchain, as + # we explicitly call Mesa with 11.0 stdenv, but buildPackages is still 10.something, + # and Mesa can't build with that. + # FIXME: figure this out, or figure out how to get rid of Mesa on Darwin, + # whichever is easier. + ++ lib.optional (!stdenv.isDarwin) buildPackages.stdenv.cc; nativeBuildInputs = [ meson pkg-config ninja |