colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #292250 from philiptaron/steam-fhsenv

Browse Source 
mesa: switch elfutils in for abandoned libelf
This commit is contained in:
K900 2024-03-01 09:25:24 +03:00 committed by GitHub
commit 3306017f03
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 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

3
pkgs/games/steam/fhsenv.nix
View File

@ -111,8 +111,7 @@ in buildFHSEnv rec {
xorg.libXdamage xorg.libXdamage
xorg.libxshmfence xorg.libxshmfence
xorg.libXxf86vm xorg.libXxf86vm
libelf elfutils
(lib.getLib elfutils)
# Without these it silently fails # Without these it silently fails
xorg.libXinerama xorg.libXinerama