From 20c31e65ab922f4b079c056dae3a0e28a01920de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 15 Feb 2016 17:05:31 +0100 Subject: [PATCH] libva: use a cleaner installation method (cherry-picked from commit 8ea5563011ee202eda146e2cc8f8754f239303cf) Tweaked not to cause a mass rebuild ATM. --- pkgs/development/libraries/libva/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index e04c3b9828d..3b4c6235686 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -21,16 +21,11 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals (!minimal) [ "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" - "--enable-glx" - ]; + "--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) - ''; + installFlags = lib.optional (!minimal) "dummy_drv_video_ladir=$(out)/lib/dri"; + postInstall = ""; meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/vaapi;