Merge #122147: mesa: Add support for building the Zink driver

+4 -1
+4 -1
pkgs/development/libraries/mesa/default.nix
··· 5 5 , llvmPackages, libffi, libomxil-bellagio, libva-minimal 6 6 , libelf, libvdpau 7 7 , libglvnd, libunwind 8 + , vulkan-loader 8 9 , galliumDrivers ? ["auto"] 9 10 , vulkanDrivers ? ["auto"] 10 11 , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] ··· 144 145 ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] 145 146 ++ lib.optionals stdenv.isDarwin [ libunwind ] 146 147 ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped ] 147 - ++ lib.optional withValgrind valgrind-light; 148 + ++ lib.optional withValgrind valgrind-light 149 + # Mesa will not build zink when gallium-drivers=auto 150 + ++ lib.optional (elem "zink" galliumDrivers) vulkan-loader; 148 151 149 152 depsBuildBuild = [ pkg-config ]; 150 153