From 390dc930d6de9ac39dbaec4319c7b7ae69476891 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 11 Dec 2017 15:04:46 +0800 Subject: libva: 1.7.3 -> 2.0.0 --- pkgs/development/libraries/libva/default.nix | 37 +++++++++++++++++----------- 1 file changed, 22 insertions(+), 15 deletions(-) (limited to 'pkgs/development/libraries/libva') diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 031ac781651..dca548a6f9d 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,36 +1,43 @@ -{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig +, libXext, libdrm, libXfixes, wayland, libffi, libX11 , mesa_noglu , minimal ? true, libva }: stdenv.mkDerivation rec { - name = "libva-${version}"; - version = "1.7.3"; - - src = fetchurl { - url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; + name = "libva-${lib.optionalString (!minimal) "full-"}${version}"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "01org"; + repo = "libva"; + rev = version; + sha256 = "1x8rlmv5wfqjz3j87byrxb4d9vp5b4lrrin2fx254nwl3aqy15hy"; }; - outputs = [ "bin" "dev" "out" ]; + outputs = [ "dev" "out" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ]; # TODO: share libs between minimal and !minimal - perhaps just symlink them - configureFlags = - [ "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" ] ++ - lib.optionals (!minimal) [ "--enable-glx" ]; + enableParallelBuilding = true; + + configureFlags = [ + "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" + ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; - installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; + installFlags = [ + "dummy_drv_video_ladir=$(out)/lib/dri" + ]; meta = with stdenv.lib; { + description = "VAAPI library: Video Acceleration API"; homepage = http://www.freedesktop.org/wiki/Software/vaapi; license = licenses.mit; - description = "VAAPI library: Video Acceleration API"; - platforms = platforms.unix; maintainers = with maintainers; [ garbas ]; + platforms = platforms.unix; }; } -- cgit 1.4.1