diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-28 15:09:34 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-17 14:43:18 -0400 |
| commit | 263f5891b65c841352f5230a1aa7e22ac418a042 (patch) | |
| tree | 0a72ec795d88b01a36455067d803a17b40ca7ab2 /pkgs/development/libraries/libva | |
| parent | f7e2bb8cff563d00769a91658d859154f2cda38a (diff) | |
| download | nixpkgs-263f5891b65c841352f5230a1aa7e22ac418a042.tar nixpkgs-263f5891b65c841352f5230a1aa7e22ac418a042.tar.gz nixpkgs-263f5891b65c841352f5230a1aa7e22ac418a042.tar.bz2 nixpkgs-263f5891b65c841352f5230a1aa7e22ac418a042.tar.lz nixpkgs-263f5891b65c841352f5230a1aa7e22ac418a042.tar.xz nixpkgs-263f5891b65c841352f5230a1aa7e22ac418a042.tar.zst nixpkgs-263f5891b65c841352f5230a1aa7e22ac418a042.zip | |
treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa
Just use mesa for these to be more clear. Move these to aliases.nix
Diffstat (limited to 'pkgs/development/libraries/libva')
| -rw-r--r-- | pkgs/development/libraries/libva/1.0.0.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libva/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
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 = [ |