diff options
author | Fabian Möller <fabianm88@gmail.com> | 2021-01-09 23:24:44 +0100 |
---|---|---|
committer | Fabian Möller <fabianm88@gmail.com> | 2021-01-22 12:25:17 +0100 |
commit | 0fe70e7fd4cf127299d63d43cf9cd996fbe6d778 (patch) | |
tree | 724436f865659c856dbc47df04779e5564ae76f6 /pkgs/development/libraries/vulkan-loader/default.nix | |
parent | bbaff89ceb389e9c21a90eefac60ebc9853144be (diff) | |
download | nixpkgs-0fe70e7fd4cf127299d63d43cf9cd996fbe6d778.tar nixpkgs-0fe70e7fd4cf127299d63d43cf9cd996fbe6d778.tar.gz nixpkgs-0fe70e7fd4cf127299d63d43cf9cd996fbe6d778.tar.bz2 nixpkgs-0fe70e7fd4cf127299d63d43cf9cd996fbe6d778.tar.lz nixpkgs-0fe70e7fd4cf127299d63d43cf9cd996fbe6d778.tar.xz nixpkgs-0fe70e7fd4cf127299d63d43cf9cd996fbe6d778.tar.zst nixpkgs-0fe70e7fd4cf127299d63d43cf9cd996fbe6d778.zip |
vulkan-loader: fix pkg-config include directory
With the last update the pkg-config file was changed to cmake variables, which made substituteInPlace ineffective. Fixes #108766
Diffstat (limited to 'pkgs/development/libraries/vulkan-loader/default.nix')
-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 c833d770aea..b3882a91942 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"; |