diff options
| author | K900 <me@0upti.me> | 2024-03-01 09:25:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 09:25:24 +0300 |
| commit | 3306017f03a57cd0d3620e87e045040b3de86d1d (patch) | |
| tree | d26488030543d6b2938d02244bcb9e0d0ac3a835 /pkgs/development/libraries/mesa | |
| parent | 40db980292c928b528d886a102f9b1988826fcf4 (diff) | |
| parent | a0e85781a7b065d4145938fd4efb1d28c0b97c0f (diff) | |
Merge pull request #292250 from philiptaron/steam-fhsenv
mesa: switch elfutils in for abandoned libelf
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 6aff1d3ff1c8f..1026955328042 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 |