summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorMoritz Ulrich <moritz@tarn-vedra.de>2016-11-21 21:14:19 +0100
committerMoritz Ulrich <moritz@tarn-vedra.de>2016-11-21 21:14:55 +0100
commitbc2fb9b2feae65049215720cba9b2cce22eb4f92 (patch)
treedb35a9711fc627caddbd199fb1a65665c6b45edd /pkgs/development/libraries
parentde2f9d67196c05ac9b4efedc7cc880ea1315f7bf (diff)
downloadnixpkgs-bc2fb9b2feae65049215720cba9b2cce22eb4f92.tar
nixpkgs-bc2fb9b2feae65049215720cba9b2cce22eb4f92.tar.gz
nixpkgs-bc2fb9b2feae65049215720cba9b2cce22eb4f92.tar.bz2
nixpkgs-bc2fb9b2feae65049215720cba9b2cce22eb4f92.tar.lz
nixpkgs-bc2fb9b2feae65049215720cba9b2cce22eb4f92.tar.xz
nixpkgs-bc2fb9b2feae65049215720cba9b2cce22eb4f92.tar.zst
nixpkgs-bc2fb9b2feae65049215720cba9b2cce22eb4f92.zip
mesa_noglu: Fix search paths for libvulkan_intel.so
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/mesa/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index e923f87722a..2b31405980b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -132,12 +132,17 @@ stdenv.mkDerivation {
       $out/lib/vdpau         \
       $out/lib/bellagio      \
       $out/lib/libxatracker* \
-      $out/lib/libvulkan_* \
+      $out/lib/libvulkan_*
 
     # move share/vulkan/icd.d/
     mv $out/share/ $drivers/
+    # Update search path used by Vulkan (it's pointing to $out but
+    # drivers are in $drivers)
+    for js in $drivers/share/vulkan/icd.d/*.json; do
+      substituteInPlace "$js" --replace "$out" "$drivers"
+    done
 
-    mv $out/lib/dri/* $drivers/lib/dri
+    mv $out/lib/dri/* $drivers/lib/dri # */
     rmdir "$out/lib/dri"
 
     # move libOSMesa to $osmesa, as it's relatively big