summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-08-07 12:05:58 +0200
committerVladimír Čunát <vcunat@gmail.com>2016-08-07 12:14:16 +0200
commit50f909cf933154591fc7886a74fa121234047926 (patch)
treea7014088309038773532bbd2bc8bca00dcc582d2 /pkgs
parent03e32315a533775357411d9b751622ad3a6d3892 (diff)
downloadnixpkgs-50f909cf933154591fc7886a74fa121234047926.tar
nixpkgs-50f909cf933154591fc7886a74fa121234047926.tar.gz
nixpkgs-50f909cf933154591fc7886a74fa121234047926.tar.bz2
nixpkgs-50f909cf933154591fc7886a74fa121234047926.tar.lz
nixpkgs-50f909cf933154591fc7886a74fa121234047926.tar.xz
nixpkgs-50f909cf933154591fc7886a74fa121234047926.tar.zst
nixpkgs-50f909cf933154591fc7886a74fa121234047926.zip
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.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/mesa/default.nix2
1 files changed, 0 insertions, 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 */