diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/vulkan-loader')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix | 46 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/vulkan-loader/system-search-path.patch | 45 |
2 files changed, 91 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix new file mode 100644 index 000000000000..a44e91e1bf5c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig +, xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }: + +let + version = "1.1.106"; +in + +assert version == vulkan-headers.version; +stdenv.mkDerivation rec { + name = "vulkan-loader-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Loader"; + rev = "sdk-${version}"; + sha256 = "0zhrwj1gi90x2w8gaaaw5h4b969a8gfy244kn0drrplhhb1nqz3b"; + }; + + nativeBuildInputs = [ pkgconfig addOpenGLRunpath ]; + buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; + enableParallelBuilding = true; + + patches = [ ./system-search-path.patch ]; + + cmakeFlags = [ + "-DSYSTEM_SEARCH_PATH=${addOpenGLRunpath.driverLink}/share" + "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" + ]; + + outputs = [ "out" "dev" ]; + + # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + postFixup = '' + addOpenGLRunpath $out/lib/libvulkan.so + ''; + + meta = with stdenv.lib; { + description = "LunarG Vulkan loader"; + homepage = https://www.lunarg.com; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/system-search-path.patch b/nixpkgs/pkgs/development/libraries/vulkan-loader/system-search-path.patch new file mode 100644 index 000000000000..26f83e6d534f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/system-search-path.patch @@ -0,0 +1,45 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9ac5ce835..cbdb0ff56 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -88,6 +88,12 @@ if(UNIX) + STRING + "Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant." + ) ++ set( ++ SYSTEM_SEARCH_PATH "" ++ CACHE ++ STRING ++ "Search path to always use, after all other search paths." ++ ) + endif() + + if(UNIX AND NOT APPLE) # i.e.: Linux +@@ -184,6 +190,7 @@ if(UNIX) + add_definitions(-DFALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}") + add_definitions(-DFALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}") + add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}") ++ add_definitions(-DSYSTEM_SEARCH_PATH="${SYSTEM_SEARCH_PATH}") + + # Make sure /etc is searched by the loader + if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc")) +diff --git a/loader/loader.c b/loader/loader.c +index 0d3b5a947..abe357004 100644 +--- a/loader/loader.c ++++ b/loader/loader.c +@@ -3688,6 +3688,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e + search_path_size += DetermineDataFilePathSize(xdgdatahome, rel_size); + search_path_size += DetermineDataFilePathSize(home_root, rel_size); + } ++ search_path_size += DetermineDataFilePathSize(SYSTEM_SEARCH_PATH, rel_size); + #endif + } + } +@@ -3737,6 +3738,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e + CopyDataFilePath(xdgdatahome, relative_location, rel_size, &cur_path_ptr); + CopyDataFilePath(home_root, relative_location, rel_size, &cur_path_ptr); + } ++ CopyDataFilePath(SYSTEM_SEARCH_PATH, relative_location, rel_size, &cur_path_ptr); + } + + // Remove the last path separator |