From 97f1a251ed5f5446c227d0ece8c0410222ab87ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 23 Mar 2014 20:32:47 +0100 Subject: [PATCH] mesa: add symlinks from $out/lib/*.so to $drivers/lib This is mainly in order for libGL to be present in /run/opengl-drivers{,-32}. Now even with mesa drivers pkgs will use your current nixos libGL instead of the one it was built against. Thanks to @iElectric for suggesting this change. --- pkgs/development/libraries/mesa/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1018a0e31f3..e5cd54c572f 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -152,6 +152,11 @@ stdenv.mkDerivation { substituteInPlace "$out/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 + '' + /* add libGL* links from /run/opengl-driver */ '' + ( + cd "$drivers/lib" + cp -s "$out"/lib/*.so . + ) ''; #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM