From 1b95212a6976dc7b8e3a8e80b8d5fc9cb6ebaa71 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 25 Jan 2016 02:56:27 +0300 Subject: libva: use OpenGL drivers link directory --- pkgs/development/libraries/libva/default.nix | 17 ++++++++++++++--- 1 file changed, 14 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 12de07ced32..b1bfa9b8e35 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi -, mesa ? null +, mesa_noglu ? null }: stdenv.mkDerivation rec { @@ -10,9 +10,20 @@ stdenv.mkDerivation rec { sha256 = "0bjfb5s8dk3lql843l91ffxzlq47isqks5sj19cxh7j3nhzw58kz"; }; - buildInputs = [ libX11 libXext pkgconfig libdrm libXfixes wayland libffi mesa ]; + buildInputs = [ libX11 libXext pkgconfig libdrm libXfixes wayland libffi mesa_noglu ]; - configureFlags = stdenv.lib.optional (mesa != null) "--enable-glx"; + configureFlags = stdenv.lib.optionals (mesa_noglu != null) [ + "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" + "--enable-glx" + ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + postInstall = '' + cp -r $out/${mesa_noglu.driverLink}/* $out + cp -r $out/$out/* $out + rm -rf $out/run $out/$(echo "$out" | cut -d "/" -f2) + ''; meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/vaapi; -- cgit 1.4.1