treewide: refactor to use libglvnd

* Implement libGL as a symlink package which uses libraries from libglvnd and
  headers from Mesa (since ones from libglvnd are outdated).
* Use libGL_driver.driverLink treewide; add FHS paths where possible.
This commit is contained in:
Nikolay Amiantov
2018-03-26 14:01:49 +03:00
parent 803e87aa1e
commit 6bf1421f13
13 changed files with 78 additions and 58 deletions
+3 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig
, libXext, libdrm, libXfixes, wayland, libffi, libX11
, libGL
, libGL, libGL_driver
, minimal ? true, libva
}:
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = [
"--with-drivers-path=${libGL.driverLink}/lib/dri"
# Add FHS paths for non-NixOS applications.
"--with-drivers-path=${libGL_driver.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri"
] ++ lib.optionals (!minimal) [ "--enable-glx" ];
installFlags = [