diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/development/libraries/libvdpau | |
parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/development/libraries/libvdpau')
-rw-r--r-- | pkgs/development/libraries/libvdpau/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 04d06a149fcf2..c2ec587a52e3a 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xorg }: +{ stdenv, fetchurl, pkgconfig, xorg, mesa_noglu }: stdenv.mkDerivation rec { name = "libvdpau-1.1.1"; @@ -14,6 +14,16 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ xorg.libX11 ]; + configureFlags = [ "--with-module-dir=${mesa_noglu.driverLink}/lib/vdpau" ]; + + 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://people.freedesktop.org/~aplattner/vdpau/; description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)"; |