diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-22 13:56:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 13:56:54 +0100 |
| commit | b91b91c03bdf6377f0e1bae9fba73f3715a33837 (patch) | |
| tree | 3dcf4fd6bebbb3a26acad020ea2cdffd84741081 | |
| parent | b6c0815993e93e1946816a72acaa04aec2a3cf14 (diff) | |
| parent | 0fe70e7fd4cf127299d63d43cf9cd996fbe6d778 (diff) | |
Merge pull request #108890 from B4dM4n/vulkan-loader-include
vulkan-loader: fix pkg-config include directory
| -rw-r--r-- | pkgs/development/libraries/vulkan-loader/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index c833d770aeaf..b3882a919421 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -15,19 +15,23 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ python3 xlibsWrapper libxcb libXrandr libXext wayland ]; - preConfigure = '' - substituteInPlace loader/vulkan.pc.in \ - --replace 'includedir=''${prefix}/include' 'includedir=${vulkan-headers}/include' \ - --replace 'libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_LIBDIR@' - ''; - cmakeFlags = [ "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" + "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ]; outputs = [ "out" "dev" ]; + doInstallCheck = true; + + installCheckPhase = '' + grep -q "${vulkan-headers}/include" $dev/lib/pkgconfig/vulkan.pc || { + echo vulkan-headers include directory not found in pkg-config file + exit 1 + } + ''; + meta = with lib; { description = "LunarG Vulkan loader"; homepage = "https://www.lunarg.com"; |