diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-15 22:09:44 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-15 22:09:44 +0100 |
commit | 3b3616193559f50e193a75df5ffaf7e234caf27a (patch) | |
tree | 5ef22f16238967dcb3ec4a635c910fb0a669e1fd /pkgs/development/libraries/libva | |
parent | 24d81d6332bf95574367a1fab9c7b734e2807047 (diff) | |
parent | 15d3d68a5ea819dd82784a9a44cfe26ed5eb74cd (diff) | |
download | nixpkgs-3b3616193559f50e193a75df5ffaf7e234caf27a.tar nixpkgs-3b3616193559f50e193a75df5ffaf7e234caf27a.tar.gz nixpkgs-3b3616193559f50e193a75df5ffaf7e234caf27a.tar.bz2 nixpkgs-3b3616193559f50e193a75df5ffaf7e234caf27a.tar.lz nixpkgs-3b3616193559f50e193a75df5ffaf7e234caf27a.tar.xz nixpkgs-3b3616193559f50e193a75df5ffaf7e234caf27a.tar.zst nixpkgs-3b3616193559f50e193a75df5ffaf7e234caf27a.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/libraries/libva')
-rw-r--r-- | pkgs/development/libraries/libva/default.nix | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index dca548a6f9d..031ac781651 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,43 +1,36 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig -, libXext, libdrm, libXfixes, wayland, libffi, libX11 +{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi , mesa_noglu , minimal ? true, libva }: stdenv.mkDerivation rec { - name = "libva-${lib.optionalString (!minimal) "full-"}${version}"; - version = "2.0.0"; - - src = fetchFromGitHub { - owner = "01org"; - repo = "libva"; - rev = version; - sha256 = "1x8rlmv5wfqjz3j87byrxb4d9vp5b4lrrin2fx254nwl3aqy15hy"; + name = "libva-${version}"; + version = "1.7.3"; + + src = fetchurl { + url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; + sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; }; - outputs = [ "dev" "out" ]; + outputs = [ "bin" "dev" "out" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ 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 - enableParallelBuilding = true; - - configureFlags = [ - "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" - ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; + 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; - maintainers = with maintainers; [ garbas ]; + description = "VAAPI library: Video Acceleration API"; platforms = platforms.unix; + maintainers = with maintainers; [ garbas ]; }; } |