diff options
author | Sean D Gillespie <sean@mistersg.net> | 2022-05-03 21:48:04 -0400 |
---|---|---|
committer | Sean D Gillespie <sean@mistersg.net> | 2022-05-03 21:50:21 -0400 |
commit | a656052b5d7a02bd49be50aef559d8a4e23f8852 (patch) | |
tree | 616574b2e7ec868667ebedbfc2bb37cd1e3b668f /pkgs | |
parent | ccb9c0e53779ec8995d22b26cbc792ad13f8d503 (diff) | |
download | nixpkgs-a656052b5d7a02bd49be50aef559d8a4e23f8852.tar nixpkgs-a656052b5d7a02bd49be50aef559d8a4e23f8852.tar.gz nixpkgs-a656052b5d7a02bd49be50aef559d8a4e23f8852.tar.bz2 nixpkgs-a656052b5d7a02bd49be50aef559d8a4e23f8852.tar.lz nixpkgs-a656052b5d7a02bd49be50aef559d8a4e23f8852.tar.xz nixpkgs-a656052b5d7a02bd49be50aef559d8a4e23f8852.tar.zst nixpkgs-a656052b5d7a02bd49be50aef559d8a4e23f8852.zip |
Vulkan: Refactor (pkgconfig -> pkg-config)
Use pkg-config rather than pkgconfig
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/vulkan-validation-layers/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/graphics/vulkan-tools/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 586aa1797bc..17ef58be4bc 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -3,7 +3,7 @@ , stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , glslang , libffi , libX11 @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}" "-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 "-Wno-dev" ]; diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 77d23df4923..9cc83e19769 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , glslang , libffi , libX11 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { "-DBUILD_ICD=OFF" # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH "-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 "-Wno-dev" ]; |