Merge branch 'staging'

This commit is contained in:
Vladimír Čunát
2014-12-26 22:41:19 +01:00
17 changed files with 46 additions and 55 deletions

View File

@@ -1,18 +1,20 @@
{ stdenv, fetchurl, pkgconfig, xlibs, libvdpau }:
stdenv.mkDerivation rec {
name = "vdpauinfo-0.1";
name = "vdpauinfo-0.9";
src = fetchurl {
url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
sha256 = "17q1spsrd5i4jzhpacbs0bb4blf74j8s45rpg0znyc1yjfk5dj5h";
sha256 = "1qy84clsz3l3hvhaxw01rl4bjqlsaml5l63rc43vck6vh8vgwh50";
};
buildInputs = [ pkgconfig xlibs.libX11 libvdpau ];
buildInputs = [ pkgconfig libvdpau ];
meta = {
meta = with stdenv.lib; {
homepage = http://people.freedesktop.org/~aplattner/vdpau/;
description = "Tool to query the Video Decode and Presentation API for Unix (VDPAU) abilities of the system";
license = "bsd";
license = licenses.mit; # expat version
platforms = platforms.unix;
maintainers = [ maintainers.vcunat ];
};
}