Merge pull request #221631 from PedroHLC/vulkan-caps-viewer-3.29
vulkan-caps-viewer: 3.28 -> 3.29
This commit is contained in:
commit
9b0777ffb3
|
@ -3,6 +3,7 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, qmake
|
, qmake
|
||||||
, vulkan-loader
|
, vulkan-loader
|
||||||
|
, wayland
|
||||||
, wrapQtAppsHook
|
, wrapQtAppsHook
|
||||||
, withX11 ? true
|
, withX11 ? true
|
||||||
, qtx11extras
|
, qtx11extras
|
||||||
|
@ -10,13 +11,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "vulkan-caps-viewer";
|
pname = "vulkan-caps-viewer";
|
||||||
version = "3.28";
|
version = "3.29";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "SaschaWillems";
|
owner = "SaschaWillems";
|
||||||
repo = "VulkanCapsViewer";
|
repo = "VulkanCapsViewer";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-gy0gFbPZAwQJHqJvk7WrbZ5y2I+9BGv9VaCoOW1QPek=";
|
hash = "sha256-c7jvlwvz85cf8lUlBPyRYvDkSlvkzSW6Jc6wlyKnHBc=";
|
||||||
# Note: this derivation strictly requires vulkan-header to be the same it was developed against.
|
# Note: this derivation strictly requires vulkan-header to be the same it was developed against.
|
||||||
# To help us, they've put it in a git-submodule.
|
# To help us, they've put it in a git-submodule.
|
||||||
# The result will work with any vulkan-loader version.
|
# The result will work with any vulkan-loader version.
|
||||||
|
@ -30,6 +31,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
vulkan-loader
|
vulkan-loader
|
||||||
|
wayland
|
||||||
] ++ lib.lists.optionals withX11 [ qtx11extras ];
|
] ++ lib.lists.optionals withX11 [ qtx11extras ];
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
|
@ -38,9 +40,8 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
qmakeFlags = [
|
qmakeFlags = [
|
||||||
"DEFINES+=wayland"
|
|
||||||
"CONFIG+=release"
|
"CONFIG+=release"
|
||||||
] ++ lib.lists.optionals withX11 [ "DEFINES+=X11" ];
|
];
|
||||||
|
|
||||||
installFlags = [ "INSTALL_ROOT=$(out)" ];
|
installFlags = [ "INSTALL_ROOT=$(out)" ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue