From bc96146e75fb68dcc1d0e4f779e75fc99e4a05b7 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sat, 8 Jun 2019 20:20:31 +0200 Subject: vulkan-loader: Always include /run/opengl-driver(-32)/share in search path. Even though FALLBACK_DATA_DIRS is set to include this, it only applies when XDG_DATA_DIRS is not defined, so the NixOS opengl.nix module still had to include these in the search path. Use a simple patch to force a default search path, consulted after all other search paths. Note that FALLBACK_DATA_DIRS is no longer set, and the default (/usr/local/share:/usr/share) applies. --- pkgs/development/libraries/vulkan-loader/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries/vulkan-loader/default.nix') diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 891ad373e02..a44e91e1bf5 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -21,8 +21,10 @@ stdenv.mkDerivation rec { buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; + patches = [ ./system-search-path.patch ]; + cmakeFlags = [ - "-DFALLBACK_DATA_DIRS=${addOpenGLRunpath.driverLink}/share:/usr/local/share:/usr/share" + "-DSYSTEM_SEARCH_PATH=${addOpenGLRunpath.driverLink}/share" "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" ]; -- cgit 1.4.1