diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2018-03-17 18:47:55 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2018-03-26 14:01:49 +0300 |
| commit | 6bf1421f13d667c2997b67728cf777c6a70716a5 (patch) | |
| tree | a8ad2d39efc437215fe958df70326ae263f98798 /pkgs/development/libraries/libva | |
| parent | 803e87aa1e5bd071713276fd13e55854f7e5e385 (diff) | |
| download | nixpkgs-6bf1421f13d667c2997b67728cf777c6a70716a5.tar nixpkgs-6bf1421f13d667c2997b67728cf777c6a70716a5.tar.gz nixpkgs-6bf1421f13d667c2997b67728cf777c6a70716a5.tar.bz2 nixpkgs-6bf1421f13d667c2997b67728cf777c6a70716a5.tar.lz nixpkgs-6bf1421f13d667c2997b67728cf777c6a70716a5.tar.xz nixpkgs-6bf1421f13d667c2997b67728cf777c6a70716a5.tar.zst nixpkgs-6bf1421f13d667c2997b67728cf777c6a70716a5.zip | |
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.
Diffstat (limited to 'pkgs/development/libraries/libva')
| -rw-r--r-- | pkgs/development/libraries/libva/1.0.0.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/libva/default.nix | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 031ac781651..47464d225e8 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 -, mesa_noglu +, libGL, libGL_driver , minimal ? true, libva }: @@ -17,11 +17,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ 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 configureFlags = - [ "--with-drivers-path=${mesa_noglu.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 = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; 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 = [ |