im ngl im too tired to figure out why this isnt working rn
This commit is contained in:
parent
edbcf2406b
commit
0caa990a93
36
flake.nix
36
flake.nix
|
@ -45,18 +45,24 @@
|
||||||
IMGUI_BUILD_VULKAN_BINDING = true;
|
IMGUI_BUILD_VULKAN_BINDING = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
deps = with pkgs; [
|
deps = with pkgs;
|
||||||
fmt
|
[
|
||||||
glfw
|
fmt
|
||||||
glm
|
glfw
|
||||||
imgui
|
glm
|
||||||
shaderc
|
glslang
|
||||||
vulkan-extension-layer
|
imgui
|
||||||
vulkan-memory-allocator
|
vulkan-extension-layer
|
||||||
vulkan-utility-libraries
|
vulkan-memory-allocator
|
||||||
vulkan-loader
|
vulkan-utility-libraries
|
||||||
vulkan-tools
|
vulkan-loader
|
||||||
];
|
vulkan-tools
|
||||||
|
]
|
||||||
|
++ (with pkgsStatic; [
|
||||||
|
spirv-tools
|
||||||
|
spirv-cross
|
||||||
|
spirv-headers
|
||||||
|
]);
|
||||||
in
|
in
|
||||||
with pkgs; rec {
|
with pkgs; rec {
|
||||||
packages = rec {
|
packages = rec {
|
||||||
|
@ -102,11 +108,12 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
devShell = mkShell.override {inherit stdenv;} {
|
devShell = mkShell.override {inherit stdenv;} rec {
|
||||||
packages =
|
buildInputs =
|
||||||
[
|
[
|
||||||
alejandra
|
alejandra
|
||||||
bear
|
bear
|
||||||
|
cmake
|
||||||
(llvmPackages_18.clang-tools.override {enableLibcxx = true;})
|
(llvmPackages_18.clang-tools.override {enableLibcxx = true;})
|
||||||
lldb
|
lldb
|
||||||
meson
|
meson
|
||||||
|
@ -123,6 +130,7 @@
|
||||||
]
|
]
|
||||||
++ deps;
|
++ deps;
|
||||||
|
|
||||||
|
LD_LIBRARY_PATH = "${lib.makeLibraryPath buildInputs}";
|
||||||
VULKAN_SDK = "${vulkan-headers}";
|
VULKAN_SDK = "${vulkan-headers}";
|
||||||
VK_LAYER_PATH = "${vulkan-validation-layers}/share/vulkan/explicit_layer.d";
|
VK_LAYER_PATH = "${vulkan-validation-layers}/share/vulkan/explicit_layer.d";
|
||||||
VK_ICD_FILENAMES =
|
VK_ICD_FILENAMES =
|
||||||
|
|
18
meson.build
18
meson.build
|
@ -31,16 +31,16 @@ deps = [
|
||||||
dependency('vulkan', include_type: 'system'),
|
dependency('vulkan', include_type: 'system'),
|
||||||
]
|
]
|
||||||
|
|
||||||
glslang_dep = cpp.find_library('glslang', required: false)
|
spirv_dep = dependency('SPIRV-Tools', required: false, include_type: 'system')
|
||||||
|
|
||||||
if not glslang_dep.found()
|
|
||||||
glslang_dep = dependency('glslang', required: true, include_type: 'system')
|
|
||||||
endif
|
|
||||||
|
|
||||||
spirv_dep = cpp.find_library('SPIRV', required: false)
|
|
||||||
|
|
||||||
if not spirv_dep.found()
|
if not spirv_dep.found()
|
||||||
spirv_dep = dependency('SPIRV', required: true, include_type: 'system')
|
spirv_dep = cpp.find_library('SPIRV-Tools', required: true)
|
||||||
|
endif
|
||||||
|
|
||||||
|
glslang_dep = dependency('glslang', required: false, include_type: 'system')
|
||||||
|
|
||||||
|
if not glslang_dep.found()
|
||||||
|
glslang_dep = cpp.find_library('glslang', required: true)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
imgui_dep = dependency('imgui', required: false, include_type: 'system')
|
imgui_dep = dependency('imgui', required: false, include_type: 'system')
|
||||||
|
@ -56,4 +56,4 @@ executable(
|
||||||
sources: files('src/main.cpp'),
|
sources: files('src/main.cpp'),
|
||||||
include_directories: include_directories('include', is_system: true),
|
include_directories: include_directories('include', is_system: true),
|
||||||
dependencies: deps,
|
dependencies: deps,
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue