public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa

Browse Source 
Just use mesa for these to be more clear. Move these to aliases.nix
This commit is contained in:
Matthew Bauer
2019-06-17 14:43:18 -04:00
parent f7e2bb8cff
commit 263f5891b6
35 changed files with 79 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libva/1.0.0.nix
+2 -2
View File
@@ -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" ];
pkgs/development/libraries/libva/default.nix
+2 -2
View File
@@ -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 = [