From 67d41749a0f4c23b736b208ac0df99bc03b85ec0 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 28 Feb 2024 20:58:59 -0800 Subject: [PATCH] mesa: switch to elfutils from abandoned libelf --- pkgs/development/libraries/mesa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index dff2f0021d46..6391e6a4709e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/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 ? @@ -241,7 +241,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 +249,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