diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-06-13 06:01:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-13 06:01:14 +0000 |
| commit | 299918b25d76aaccb80389af47579d3f44748fab (patch) | |
| tree | f84b0c755ac63e0bc815ff749bbc23e3ca6fe9ba /pkgs/development/libraries/mesa | |
| parent | 9dc58490251ac2beef8988e449f478e01da43171 (diff) | |
| parent | f2c328c3ac2923fa9060fd507ecd830470157b0b (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 0a0d5b47b9a06..a2acd331e783d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -210,6 +210,8 @@ self = stdenv.mkDerivation { # Rusticl, new OpenCL frontend "-Dgallium-rusticl=true" "-Drust_std=2021" "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib" + ] ++ lib.optionals (!withValgrind) [ + "-Dvalgrind=disabled" ] ++ lib.optional enablePatentEncumberedCodecs "-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec" ++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; |