ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-17 10:40:33 +03:00
Code Issues Projects Releases Wiki Activity

mesa: switch to elfutils from abandoned libelf

Browse Source
This commit is contained in:
Philip Taron 2024-02-28 20:58:59 -08:00
parent 392bc69fa7
commit 67d41749a0
No known key found for this signature in database
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/mesa/default.nix
View File

@ -3,7 +3,7 @@
, intltool, bison, flex, file, python3Packages, wayland-scanner , intltool, bison, flex, file, python3Packages, wayland-scanner
, expat, libdrm, xorg, wayland, wayland-protocols, openssl , expat, libdrm, xorg, wayland, wayland-protocols, openssl
, llvmPackages, libffi, libomxil-bellagio, libva-minimal , llvmPackages, libffi, libomxil-bellagio, libva-minimal
, libelf, libvdpau , elfutils, libvdpau
, libglvnd, libunwind, lm_sensors , libglvnd, libunwind, lm_sensors
, vulkan-loader, glslang , vulkan-loader, glslang
, galliumDrivers ? , galliumDrivers ?
@ -241,7 +241,7 @@ self = stdenv.mkDerivation {
buildInputs = with xorg; [ buildInputs = with xorg; [
expat glslang llvmPackages.libllvm libglvnd xorgproto expat glslang llvmPackages.libllvm libglvnd xorgproto
libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
libffi libvdpau libelf libXvMC libffi libvdpau libXvMC
libpthreadstubs openssl libpthreadstubs openssl
zstd zstd
] ++ lib.optionals withLibunwind [ ] ++ lib.optionals withLibunwind [
@ -249,7 +249,7 @@ self = stdenv.mkDerivation {
] ++ [ ] ++ [
python3Packages.python # for shebang python3Packages.python # for shebang
] ++ lib.optionals haveWayland [ wayland wayland-protocols ] ] ++ 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.optionals enableOpenCL [ llvmPackages.libclc llvmPackages.clang llvmPackages.clang-unwrapped spirv-llvm-translator ]
++ lib.optional withValgrind valgrind-light ++ lib.optional withValgrind valgrind-light
++ lib.optional haveZink vulkan-loader ++ lib.optional haveZink vulkan-loader