BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #196310 from LunNova/lunnova/mesa-layers

Browse source 
mesa: add vulkanLayers option and default it to device-select, overlay
This commit is contained in:
Thiago Kenji Okada 2022-10-26 11:47:12 +01:00 committed by GitHub
commit e46fce495a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/libraries/mesa/default.nix
View file

@ -9,6 +9,7 @@
, galliumDrivers ? ["auto"] , galliumDrivers ? ["auto"]
, vulkanDrivers ? ["auto"] , vulkanDrivers ? ["auto"]
, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ]
, vulkanLayers ? [ "device-select" "overlay" ]
, OpenGL, Xplugin , OpenGL, Xplugin
, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !valgrind-light.meta.broken, valgrind-light , withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !valgrind-light.meta.broken, valgrind-light
, enableGalliumNine ? stdenv.isLinux , enableGalliumNine ? stdenv.isLinux
@ -119,7 +120,8 @@ self = stdenv.mkDerivation {
"-Dgallium-opencl=icd" # Enable the gallium OpenCL frontend "-Dgallium-opencl=icd" # Enable the gallium OpenCL frontend
"-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib" "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib"
] ++ optional enablePatentEncumberedCodecs ] ++ optional enablePatentEncumberedCodecs
"-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"; "-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec"
++ optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}";
buildInputs = with xorg; [ buildInputs = with xorg; [
expat llvmPackages.libllvm libglvnd xorgproto expat llvmPackages.libllvm libglvnd xorgproto
@ -195,6 +197,11 @@ self = stdenv.mkDerivation {
# move libOSMesa to $osmesa, as it's relatively big # move libOSMesa to $osmesa, as it's relatively big
mkdir -p $osmesa/lib mkdir -p $osmesa/lib
mv -t $osmesa/lib/ $out/lib/libOSMesa* mv -t $osmesa/lib/ $out/lib/libOSMesa*
'' + lib.optionalString (vulkanLayers != []) ''
mv -t $drivers/lib $out/lib/libVkLayer*
for js in $drivers/share/vulkan/{im,ex}plicit_layer.d/*.json; do
substituteInPlace "$js" --replace '"libVkLayer_' '"'"$drivers/lib/libVkLayer_"
done
''; '';
postFixup = optionalString stdenv.isLinux '' postFixup = optionalString stdenv.isLinux ''