dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge #171474: Vulkan: Refactor (pkgconfig -> pkg-config)

Browse Source
This commit is contained in:
Vladimír Čunát 2022-05-04 07:03:46 +02:00
commit 8070351515
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/vulkan-validation-layers/default.nix
View File

@ -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"
]; ];

6
pkgs/tools/graphics/vulkan-tools/default.nix
View File

@ -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"
]; ];