From 6bf1421f13d667c2997b67728cf777c6a70716a5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Mar 2018 18:47:55 +0300 Subject: 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. --- pkgs/development/libraries/libva/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/libva/default.nix') diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 6b8c3631fb3..b1108355106 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -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 = [ -- cgit 1.4.1