diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
| commit | 46a88117a05c3469af5d99433af140c3de8ca088 (patch) | |
| tree | d7f0557756d8f07a3081b3498c05ddc5a8ad429d /nixpkgs/pkgs/development/libraries/mesa/default.nix | |
| parent | e97457545cea0b2ca421da257c83d8f1ef451d85 (diff) | |
| parent | a343533bccc62400e8a9560423486a3b6c11a23b (diff) | |
| download | nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.gz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.bz2 nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.lz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.xz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.zst nixlib-46a88117a05c3469af5d99433af140c3de8ca088.zip | |
Merge commit 'a343533bccc62400e8a9560423486a3b6c11a23b'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mesa/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/mesa/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index dff2f0021d46..a40f5c6b15e4 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -3,7 +3,7 @@ , intltool, bison, flex, file, python3Packages, wayland-scanner , expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal -, libelf, libvdpau +, elfutils, libvdpau , libglvnd, libunwind, lm_sensors , vulkan-loader, glslang , galliumDrivers ? @@ -81,8 +81,8 @@ # nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa let - version = "24.0.1"; - hash = "sha256-84cZKwjEccVFWQ3RIjCio0MkSAS1/oZv7GrqAuq1dhM="; + version = "24.0.2"; + hash = "sha256-lOKKjtrQbY7SuD61PyU7nrWqYsMID5OXAuGzA5tWyeg="; # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule @@ -141,6 +141,11 @@ self = stdenv.mkDerivation { patches = [ ./opencl.patch + + # Backport crash fix for Radeon (legacy) kernel driver + # see https://gitlab.freedesktop.org/mesa/mesa/-/issues/10613 + # FIXME: remove when merged upstream + ./backport-radeon-crash-fix.patch ]; postPatch = '' @@ -241,7 +246,7 @@ self = stdenv.mkDerivation { buildInputs = with xorg; [ expat glslang llvmPackages.libllvm libglvnd xorgproto libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr - libffi libvdpau libelf libXvMC + libffi libvdpau libXvMC libpthreadstubs openssl zstd ] ++ lib.optionals withLibunwind [ @@ -249,7 +254,7 @@ self = stdenv.mkDerivation { ] ++ [ python3Packages.python # for shebang ] ++ lib.optionals haveWayland [ wayland wayland-protocols ] - ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal udev lm_sensors ] + ++ lib.optionals stdenv.isLinux [ elfutils libomxil-bellagio libva-minimal udev lm_sensors ] ++ lib.optionals enableOpenCL [ llvmPackages.libclc llvmPackages.clang llvmPackages.clang-unwrapped spirv-llvm-translator ] ++ lib.optional withValgrind valgrind-light ++ lib.optional haveZink vulkan-loader |