diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-06-12 09:59:45 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:14:17 +0000 |
| commit | c5571a126859eb658ffd7340cb580f7d91f12bb6 (patch) | |
| tree | 577573c3bf14d9849246d52daece719a10eaf138 /nixpkgs/pkgs/development/libraries/vulkan-loader | |
| parent | 828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7 (diff) | |
| parent | 98e3b90b6c8f400ae5438ef868eb992a64b75ce5 (diff) | |
| download | nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.gz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.bz2 nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.lz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.xz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.zst nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.zip | |
Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/vulkan-loader')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix index 7d53065ba324..891ad373e027 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig -, xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: +, xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }: let version = "1.1.106"; @@ -17,17 +17,23 @@ stdenv.mkDerivation rec { sha256 = "0zhrwj1gi90x2w8gaaaw5h4b969a8gfy244kn0drrplhhb1nqz3b"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig addOpenGLRunpath ]; buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; cmakeFlags = [ - "-DFALLBACK_DATA_DIRS=${libGL_driver.driverLink}/share:/usr/local/share:/usr/share" + "-DFALLBACK_DATA_DIRS=${addOpenGLRunpath.driverLink}/share:/usr/local/share:/usr/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; |