From 50f909cf933154591fc7886a74fa121234047926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 7 Aug 2016 12:05:58 +0200 Subject: [PATCH] mesa: have vdpau drivers in lib/vdpau again This was done by @abbradar 364f297bb2 but I lost that change by accident when doing large closure-size merges 39ebb01d. Fortunately it seems to have caused no problems, likely because ${mesa_drivers}/lib gets into $LD_LIBRARY_PATH. --- pkgs/development/libraries/mesa/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 5ddc7bf3ddb..4ed47f46a32 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -144,8 +144,6 @@ stdenv.mkDerivation { '' + /* set the default search path for DRI drivers; used e.g. by X server */ '' substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}" - '' + /* move vdpau drivers to $drivers/lib, so they are found */ '' - mv "$drivers"/lib/vdpau/* "$drivers"/lib/ && rmdir "$drivers"/lib/vdpau ''; #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM */