From bc2fb9b2feae65049215720cba9b2cce22eb4f92 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 21 Nov 2016 21:14:19 +0100 Subject: [PATCH] mesa_noglu: Fix search paths for libvulkan_intel.so --- pkgs/development/libraries/mesa/default.nix | 9 +++++++-- 1 file 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