public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge recent 'staging' into closure-size

Browse Source 
Let's get rid of those merge conflicts.
This commit is contained in:
Vladimír Čunát
2016-02-03 16:57:19 +01:00
parent c979012631 53e0f8b1cd
commit ae74c356d9
637 changed files with 123880 additions and 83341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libva/default.nix
+16 -5
View File
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
, mesa_noglu
, minimal ? true, libva
}:
stdenv.mkDerivation rec {
name = "libva-1.6.1";
name = "libva-1.6.2";
src = fetchurl {
url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
sha256 = "0bjfb5s8dk3lql843l91ffxzlq47isqks5sj19cxh7j3nhzw58kz";
sha256 = "1l4bij21shqbfllbxicmqgmay4v509v9hpxyyia9wm7gvsfg05y4";
};
outputs = [ "dev" "out" "bin" ];
@@ -16,10 +16,21 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libdrm ]
++ stdenv.lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ];
++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ];
# TODO: share libs between minimal and !minimal - perhaps just symlink them
#configureFlags = stdenv.lib.optional (mesa != null) "--enable-glx";
configureFlags = lib.optionals (!minimal) [
"--with-drivers-path=${mesa_noglu.driverLink}/lib/dri"
"--enable-glx"
];
installFlags = lib.optional (!minimal) "DESTDIR=$(out)";
postInstall = lib.optionalString (!minimal) ''
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;