treewide: transition from mesa_noglu to libGL

This commit is contained in:
Alexander V. Nikolaev
2018-02-24 17:03:46 +02:00
parent 8da9b485ec
commit 8f2a22935c
50 changed files with 107 additions and 107 deletions
+3 -3
View File
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig
, libXext, libdrm, libXfixes, wayland, libffi, libX11
, mesa_noglu
, libGL
, minimal ? true, libva
}:
@@ -20,13 +20,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libdrm ]
++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ];
++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi libGL ];
# TODO: share libs between minimal and !minimal - perhaps just symlink them
enableParallelBuilding = true;
configureFlags = [
"--with-drivers-path=${mesa_noglu.driverLink}/lib/dri"
"--with-drivers-path=${libGL.driverLink}/lib/dri"
] ++ lib.optionals (!minimal) [ "--enable-glx" ];
installFlags = [