Merge #122147: mesa: Add support for building the Zink driver
This commit is contained in:
commit
d8dd85d03f
1 changed files with 4 additions and 1 deletions
|
@ -5,6 +5,7 @@
|
||||||
, llvmPackages, libffi, libomxil-bellagio, libva-minimal
|
, llvmPackages, libffi, libomxil-bellagio, libva-minimal
|
||||||
, libelf, libvdpau
|
, libelf, libvdpau
|
||||||
, libglvnd, libunwind
|
, libglvnd, libunwind
|
||||||
|
, vulkan-loader
|
||||||
, galliumDrivers ? ["auto"]
|
, galliumDrivers ? ["auto"]
|
||||||
, vulkanDrivers ? ["auto"]
|
, vulkanDrivers ? ["auto"]
|
||||||
, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ]
|
, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ]
|
||||||
|
@ -144,7 +145,9 @@ self = stdenv.mkDerivation {
|
||||||
++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]
|
++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]
|
||||||
++ lib.optionals stdenv.isDarwin [ libunwind ]
|
++ lib.optionals stdenv.isDarwin [ libunwind ]
|
||||||
++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped ]
|
++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped ]
|
||||||
++ lib.optional withValgrind valgrind-light;
|
++ lib.optional withValgrind valgrind-light
|
||||||
|
# Mesa will not build zink when gallium-drivers=auto
|
||||||
|
++ lib.optional (elem "zink" galliumDrivers) vulkan-loader;
|
||||||
|
|
||||||
depsBuildBuild = [ pkg-config ];
|
depsBuildBuild = [ pkg-config ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue