Vulkan: Refactor (pkgconfig -> pkg-config)
Use pkg-config rather than pkgconfig
This commit is contained in:
parent
ccb9c0e537
commit
a656052b5d
|
@ -3,7 +3,7 @@
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, cmake
|
, cmake
|
||||||
, pkgconfig
|
, pkg-config
|
||||||
, glslang
|
, glslang
|
||||||
, libffi
|
, libffi
|
||||||
, libX11
|
, libX11
|
||||||
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
pkgconfig
|
pkg-config
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
|
||||||
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"
|
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"
|
||||||
"-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}"
|
"-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}"
|
||||||
"-DBUILD_LAYER_SUPPORT_FILES=ON"
|
"-DBUILD_LAYER_SUPPORT_FILES=ON"
|
||||||
"-DPKG_CONFIG_EXECUTABLE=${pkgconfig}/bin/pkg-config"
|
"-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config"
|
||||||
# Hide dev warnings that are useless for packaging
|
# Hide dev warnings that are useless for packaging
|
||||||
"-Wno-dev"
|
"-Wno-dev"
|
||||||
];
|
];
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, cmake
|
, cmake
|
||||||
, pkgconfig
|
, pkg-config
|
||||||
, glslang
|
, glslang
|
||||||
, libffi
|
, libffi
|
||||||
, libX11
|
, libX11
|
||||||
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
pkgconfig
|
pkg-config
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||||
"-DBUILD_ICD=OFF"
|
"-DBUILD_ICD=OFF"
|
||||||
# vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH
|
# vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH
|
||||||
"-DCMAKE_INSTALL_RPATH=${libraryPath}"
|
"-DCMAKE_INSTALL_RPATH=${libraryPath}"
|
||||||
"-DPKG_CONFIG_EXECUTABLE=${pkgconfig}/bin/pkg-config"
|
"-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config"
|
||||||
# Hide dev warnings that are useless for packaging
|
# Hide dev warnings that are useless for packaging
|
||||||
"-Wno-dev"
|
"-Wno-dev"
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in a new issue