cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

vulkan-loader: fix pkg-config include directory

Browse source 
With the last update the pkg-config file was changed to cmake variables,
which made substituteInPlace ineffective.

Fixes #108766
This commit is contained in:
Fabian Möller 2021-01-09 23:24:44 +01:00
parent bbaff89ceb
commit 0fe70e7fd4
No known key found for this signature in database
GPG key ID: 70B29D65DD8A7E31
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/libraries/vulkan-loader/default.nix
View file

@ -15,19 +15,23 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ]; nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ python3 xlibsWrapper libxcb libXrandr libXext wayland ]; 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 = [ cmakeFlags = [
"-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"
"-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"
"-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include"
]; ];
outputs = [ "out" "dev" ]; 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; { meta = with lib; {
description = "LunarG Vulkan loader"; description = "LunarG Vulkan loader";
homepage = "https://www.lunarg.com"; homepage = "https://www.lunarg.com";