From 8f2a22935c31140891591ed3bb3e6baf230bc4f0 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 24 Feb 2018 14:06:44 +0200 Subject: treewide: transition from mesa_noglu to libGL --- pkgs/development/libraries/libva/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries/libva') diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index dca548a6f9d..7979eaec774 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 -, 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 = [ -- cgit 1.4.1