From 263f5891b65c841352f5230a1aa7e22ac418a042 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 28 May 2019 15:09:34 -0400 Subject: treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa Just use mesa for these to be more clear. Move these to aliases.nix --- pkgs/development/libraries/libva/1.0.0.nix | 4 ++-- pkgs/development/libraries/libva/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries/libva') diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 097ac0e3e98..2d827e20521 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi -, libGL, libGL_driver +, libGL, mesa , minimal ? false, libva1-minimal }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { configureFlags = # Add FHS paths for non-NixOS applications. - [ "--with-drivers-path=${libGL_driver.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ + [ "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 752d56a344e..c7f488e8726 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_driver +, libGL, mesa , minimal ? false, libva-minimal }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ # Add FHS paths for non-NixOS applications. - "--with-drivers-path=${libGL_driver.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" + "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ -- cgit 1.4.1