mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-17 14:19:58 +03:00
099c13da1b
* substitute(): --subst-var was silently coercing to "" if the variable does not exist. * libffi: simplify using `checkInputs` * pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix * utillinux: 2.32 -> 2.32.1 https://lkml.org/lkml/2018/7/16/532 * busybox: 1.29.0 -> 1.29.1 * bind: 9.12.1-P2 -> 9.12.2 https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html * curl: 7.60.0 -> 7.61.0 * gvfs: make tests run, but disable * ilmbase: disable tests on i686. Spooky! * mdds: fix tests * git: disable checks as tests are run in installcheck * ruby: disable tests * libcommuni: disable checks as tests are run in installcheck * librdf: make tests run, but disable * neon, neon_0_29: make tests run, but disable * pciutils: 3.6.0 -> 3.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions. * mesa: more include fixes mostly from void-linux (thanks!) * npth: 1.5 -> 1.6 minor bump * boost167: Add lockfree next_prior patch * stdenv: cleanup darwin bootstrapping Also gets rid of the full python and some of it's dependencies in the stdenv build closure. * Revert "pciutils: use standardized equivalent for canonicalize_file_name" This reverts commitf8db20fb3a
. Patching should no longer be needed with 3.6.1. * binutils-wrapper: Try to avoid adding unnecessary -L flags (cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9) Signed-off-by: Domen Kožar <domen@dev.si> * libffi: don't check on darwin libffi usages in stdenv broken darwin. We need to disable doCheck for that case. * "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook * python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273 When `py.test` was run with a folder as argument, it would not only search for tests in that folder, but also create a .pytest-cache folder. Not only is this state we don't want, but it was also causing collisions. * parity-ui: fix after merge * python.pkgs.pytest-flake8: disable test, fix build * Revert "meson: 0.46.1 -> 0.47.0" With meson 0.47.0 (or 0.47.1, or git) things are very wrong re:rpath handling resulting in at best missing libs but even corrupt binaries :(. When we run patchelf it masks the problem by removing obviously busted paths. Which is probably why this wasn't noticed immediately. Unfortunately the binary already has a long series of paths scribbled in a space intended for a much smaller string; in my testing it was something like lengths were 67 with 300+ written to it. I think we've reported the relevant issues upstream, but unfortunately it appears our patches are what introduces the overwrite/corruption (by no longer being correct in what they assume) This doesn't look so bad to fix but it's not something I can spend more time on at the moment. -- Interestingly the overwritten string data (because it is scribbled past the bounds) remains in the binary and is why we're suddenly seeing unexpected references in various builds -- notably this is is the reason we're seeing the "extra-utils" breakage that entirely crippled NixOS on master (and probably on staging before?). Fixes #43650. This reverts commit305ac4dade
. (cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d) Signed-off-by: Domen Kožar <domen@dev.si>
279 lines
8.8 KiB
Nix
279 lines
8.8 KiB
Nix
{ stdenv, fetchurl, lib
|
|
, pkgconfig, intltool, autoreconfHook
|
|
, file, expat, libdrm, xorg, wayland, wayland-protocols, openssl
|
|
, llvmPackages, libffi, libomxil-bellagio, libva-minimal
|
|
, libelf, libvdpau, valgrind-light, python2
|
|
, libglvnd
|
|
, grsecEnabled ? false
|
|
, enableRadv ? true
|
|
# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa.
|
|
# It's overridden for mesa_drivers.
|
|
, enableTextureFloats ? false
|
|
, galliumDrivers ? null
|
|
, driDrivers ? null
|
|
, vulkanDrivers ? null
|
|
}:
|
|
|
|
/** Packaging design:
|
|
- The basic mesa ($out) contains headers and libraries (GLU is in libGLU now).
|
|
This or the mesa attribute (which also contains GLU) are small (~ 2 MB, mostly headers)
|
|
and are designed to be the buildInput of other packages.
|
|
- DRI drivers are compiled into $drivers output, which is much bigger and
|
|
depends on LLVM. These should be searched at runtime in
|
|
"/run/opengl-driver{,-32}/lib/*" and so are kind-of impure (given by NixOS).
|
|
(I suppose on non-NixOS one would create the appropriate symlinks from there.)
|
|
- libOSMesa is in $osmesa (~4 MB)
|
|
*/
|
|
|
|
with stdenv.lib;
|
|
|
|
if ! lists.elem stdenv.system platforms.mesaPlatforms then
|
|
throw "unsupported platform for Mesa"
|
|
else
|
|
|
|
let
|
|
defaultGalliumDrivers =
|
|
if stdenv.isAarch32
|
|
then ["virgl" "nouveau" "freedreno" "vc4" "etnaviv" "imx"]
|
|
else if stdenv.isAarch64
|
|
then ["virgl" "nouveau" "vc4" ]
|
|
else ["virgl" "svga" "i915" "r300" "r600" "radeonsi" "nouveau"];
|
|
defaultDriDrivers =
|
|
if (stdenv.isAarch32 || stdenv.isAarch64)
|
|
then ["nouveau"]
|
|
else ["i915" "i965" "nouveau" "radeon" "r200"];
|
|
defaultVulkanDrivers =
|
|
if (stdenv.isAarch32 || stdenv.isAarch64)
|
|
then []
|
|
else ["intel"] ++ lib.optional enableRadv "radeon";
|
|
in
|
|
|
|
let gallium_ = galliumDrivers; dri_ = driDrivers; vulkan_ = vulkanDrivers; in
|
|
|
|
let
|
|
galliumDrivers =
|
|
(if gallium_ == null
|
|
then defaultGalliumDrivers
|
|
else gallium_)
|
|
++ ["swrast" "virgl"];
|
|
driDrivers =
|
|
(if dri_ == null
|
|
then defaultDriDrivers
|
|
else dri_) ++ ["swrast"];
|
|
vulkanDrivers =
|
|
if vulkan_ == null
|
|
then defaultVulkanDrivers
|
|
else vulkan_;
|
|
in
|
|
|
|
let
|
|
version = "18.1.4";
|
|
branch = head (splitString "." version);
|
|
in
|
|
|
|
let self = stdenv.mkDerivation {
|
|
name = "mesa-noglu-${version}";
|
|
|
|
src = fetchurl {
|
|
urls = [
|
|
"ftp://ftp.freedesktop.org/pub/mesa/mesa-${version}.tar.xz"
|
|
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
|
|
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
|
|
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
|
|
];
|
|
sha256 = "12zm9hc3v4wnzhqyrvf2kfnz55idzdn82hs3ry940l45bn5lhq9h";
|
|
};
|
|
|
|
prePatch = "patchShebangs .";
|
|
|
|
# TODO:
|
|
# revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved
|
|
# ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog
|
|
patches = [
|
|
./glx_ro_text_segm.patch # fix for grsecurity/PaX
|
|
./symlink-drivers.patch
|
|
./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl
|
|
];
|
|
|
|
outputs = [ "out" "dev" "drivers" "osmesa" ];
|
|
|
|
# TODO: Figure out how to enable opencl without having a runtime dependency on clang
|
|
configureFlags = [
|
|
"--sysconfdir=${libglvnd.driverLink}/etc"
|
|
"--localstatedir=/var"
|
|
"--with-dri-driverdir=$(drivers)/lib/dri"
|
|
"--with-dri-searchpath=${libglvnd.driverLink}/lib/dri"
|
|
"--with-platforms=x11,wayland,drm"
|
|
]
|
|
++ (optional (galliumDrivers != [])
|
|
("--with-gallium-drivers=" +
|
|
builtins.concatStringsSep "," galliumDrivers))
|
|
++ (optional (driDrivers != [])
|
|
("--with-dri-drivers=" +
|
|
builtins.concatStringsSep "," driDrivers))
|
|
++ (optional (vulkanDrivers != [])
|
|
("--with-vulkan-drivers=" +
|
|
builtins.concatStringsSep "," vulkanDrivers))
|
|
++ [
|
|
(enableFeature enableTextureFloats "texture-float")
|
|
(enableFeature grsecEnabled "glx-rts")
|
|
(enableFeature stdenv.isLinux "dri3")
|
|
(enableFeature stdenv.isLinux "nine") # Direct3D in Wine
|
|
"--enable-libglvnd"
|
|
"--enable-dri"
|
|
"--enable-driglx-direct"
|
|
"--enable-gles1"
|
|
"--enable-gles2"
|
|
"--enable-glx"
|
|
# https://bugs.freedesktop.org/show_bug.cgi?id=35268
|
|
(enableFeature (!stdenv.hostPlatform.isMusl) "glx-tls")
|
|
"--enable-gallium-osmesa" # used by wine
|
|
"--enable-llvm"
|
|
"--enable-egl"
|
|
"--enable-xa" # used in vmware driver
|
|
"--enable-gbm"
|
|
"--enable-xvmc"
|
|
"--enable-vdpau"
|
|
"--enable-shared-glapi"
|
|
"--enable-sysfs"
|
|
"--enable-llvm-shared-libs"
|
|
"--enable-omx-bellagio"
|
|
"--enable-va"
|
|
"--disable-opencl"
|
|
];
|
|
|
|
nativeBuildInputs = [ autoreconfHook intltool pkgconfig file ];
|
|
|
|
propagatedBuildInputs = with xorg;
|
|
[ libXdamage libXxf86vm ]
|
|
++ optional stdenv.isLinux libdrm;
|
|
|
|
buildInputs = with xorg; [
|
|
expat llvmPackages.llvm libglvnd
|
|
glproto dri2proto dri3proto presentproto
|
|
libX11 libXext libxcb libXt libXfixes libxshmfence
|
|
libffi wayland wayland-protocols libvdpau libelf libXvMC
|
|
libomxil-bellagio libva-minimal libpthreadstubs openssl/*or another sha1 provider*/
|
|
valgrind-light python2 python2.pkgs.Mako
|
|
];
|
|
|
|
enableParallelBuilding = true;
|
|
doCheck = false;
|
|
|
|
installFlags = [
|
|
"sysconfdir=\${drivers}/etc"
|
|
"localstatedir=\${TMPDIR}"
|
|
"vendorjsondir=\${out}/share/glvnd/egl_vendor.d"
|
|
];
|
|
|
|
# TODO: probably not all .la files are completely fixed, but it shouldn't matter;
|
|
postInstall = ''
|
|
# move gallium-related stuff to $drivers, so $out doesn't depend on LLVM
|
|
mv -t "$drivers/lib/" \
|
|
$out/lib/libXvMC* \
|
|
$out/lib/d3d \
|
|
$out/lib/vdpau \
|
|
$out/lib/bellagio \
|
|
$out/lib/libxatracker* \
|
|
$out/lib/libvulkan_*
|
|
|
|
# Move other drivers to a separate output
|
|
mv $out/lib/dri/* $drivers/lib/dri # */
|
|
rmdir "$out/lib/dri"
|
|
mv $out/lib/lib*_mesa* $drivers/lib
|
|
|
|
# move libOSMesa to $osmesa, as it's relatively big
|
|
mkdir -p {$osmesa,$drivers}/lib/
|
|
mv -t $osmesa/lib/ $out/lib/libOSMesa*
|
|
|
|
# now fix references in .la files
|
|
sed "/^libdir=/s,$out,$osmesa," -i $osmesa/lib/libOSMesa*.la
|
|
|
|
# set the default search path for DRI drivers; used e.g. by X server
|
|
substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${libglvnd.driverLink}"
|
|
|
|
# remove GLES libraries; they are provided by libglvnd
|
|
rm $out/lib/lib{GLESv1_CM,GLESv2}.*
|
|
|
|
# remove pkgconfig files for GL/GLES/EGL; they are provided by libGL.
|
|
rm $dev/lib/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc
|
|
|
|
# move vendor files
|
|
mv $out/share/ $drivers/
|
|
|
|
# Update search path used by glvnd
|
|
for js in $drivers/share/glvnd/egl_vendor.d/*.json; do
|
|
substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_"
|
|
done
|
|
|
|
# Update search path used by pkg-config
|
|
for pc in $dev/lib/pkgconfig/{d3d,dri,xatracker}.pc; do
|
|
substituteInPlace "$pc" --replace $out $drivers
|
|
done
|
|
'' + optionalString (vulkanDrivers != []) ''
|
|
# Update search path used by Vulkan (it's pointing to $out but
|
|
# drivers are in $drivers)
|
|
for js in $drivers/share/vulkan/icd.d/*.json; do
|
|
substituteInPlace "$js" --replace "$out" "$drivers"
|
|
done
|
|
'';
|
|
|
|
# TODO:
|
|
# check $out doesn't depend on llvm: builder failures are ignored
|
|
# for some reason grep -qv '${llvmPackages.llvm}' -R "$out";
|
|
postFixup = ''
|
|
# add RPATH so the drivers can find the moved libgallium and libdricore9
|
|
# moved here to avoid problems with stripping patchelfed files
|
|
for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do
|
|
if [[ ! -L "$lib" ]]; then
|
|
patchelf --set-rpath "$(patchelf --print-rpath $lib):$drivers/lib" "$lib"
|
|
fi
|
|
done
|
|
'';
|
|
|
|
passthru = {
|
|
inherit libdrm version;
|
|
inherit (libglvnd) driverLink;
|
|
|
|
stubs = stdenv.mkDerivation {
|
|
name = "libGL-${libglvnd.version}";
|
|
outputs = [ "out" "dev" ];
|
|
|
|
# Use stub libraries from libglvnd and headers from Mesa.
|
|
buildCommand = ''
|
|
ln -s ${libglvnd.out} $out
|
|
mkdir -p $dev/{,lib/pkgconfig,nix-support}
|
|
echo "$out" > $dev/nix-support/propagated-build-inputs
|
|
ln -s ${self.dev}/include $dev/include
|
|
|
|
genPkgConfig() {
|
|
local name="$1"
|
|
local lib="$2"
|
|
|
|
cat <<EOF >$dev/lib/pkgconfig/$name.pc
|
|
Name: $name
|
|
Description: $lib library
|
|
Version: ${self.version}
|
|
Libs: -L${libglvnd.out}/lib -l$lib
|
|
Cflags: -I${self.dev}/include
|
|
EOF
|
|
}
|
|
|
|
genPkgConfig gl GL
|
|
genPkgConfig egl EGL
|
|
genPkgConfig glesv1_cm GLESv1_CM
|
|
genPkgConfig glesv2 GLESv2
|
|
'';
|
|
};
|
|
};
|
|
|
|
meta = with stdenv.lib; {
|
|
description = "An open source implementation of OpenGL";
|
|
homepage = https://www.mesa3d.org/;
|
|
license = licenses.mit; # X11 variant, in most files
|
|
platforms = platforms.linux;
|
|
maintainers = with maintainers; [ eduarrrd vcunat ];
|
|
};
|
|
};
|
|
in self
|