From 56300ee0f0b34681bf30097ae8e4af93eaa0a3a9 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 30 Jul 2016 12:14:36 +0200 Subject: [PATCH] libva: set driver path correctly in minimal version This does not introduce a dependency on mesa, as mesa_noglu.driverLink == "/run/opengl-driver" Fixes #17264. --- pkgs/development/libraries/libva/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 1d293f9ffcb8..44db602f1eba 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -19,10 +19,9 @@ stdenv.mkDerivation rec { ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ]; # TODO: share libs between minimal and !minimal - perhaps just symlink them - configureFlags = lib.optionals (!minimal) [ - "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" - "--enable-glx" - ]; + configureFlags = + [ "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" ] ++ + lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ];