hosts/satori: random update
dont use mesa overrides and delete useless comments Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
@@ -13,32 +13,11 @@ in
|
||||
nvidia-offload
|
||||
];
|
||||
hardware = {
|
||||
/*opengl =
|
||||
let
|
||||
fn = oa: with lib; {
|
||||
nativeBuildInputs = oa.nativeBuildInputs ++ singleton pkgs.glslang;
|
||||
mesonFlags = oa.mesonFlags ++ singleton "-Dvulkan-layers=device-select,overlay";
|
||||
patches = oa.patches ++ singleton ./mesa-vulkan-layer-nvidia.patch;
|
||||
postInstall = oa.postInstall + ''
|
||||
mv $out/lib/libVkLayer* $drivers/lib
|
||||
layer=VkLayer_MESA_device_select
|
||||
substituteInPlace $drivers/share/vulkan/implicit_layer.d/''${layer}.json \
|
||||
--replace "lib''${layer}" "$drivers/lib/lib''${layer}"
|
||||
layer=VkLayer_MESA_overlay
|
||||
substituteInPlace $drivers/share/vulkan/explicit_layer.d/''${layer}.json \
|
||||
--replace "lib''${layer}" "$drivers/lib/lib''${layer}"
|
||||
'';
|
||||
};
|
||||
in
|
||||
with pkgs; {
|
||||
driSupport32Bit = true;
|
||||
enable = true;
|
||||
package = (mesa.overrideAttrs fn).drivers;
|
||||
package32 = (pkgsi686Linux.mesa.overrideAttrs fn).drivers;
|
||||
};*/
|
||||
opengl = {
|
||||
driSupport32Bit = true;
|
||||
enable = true;
|
||||
package = pkgs.master.mesa.drivers;
|
||||
package32 = pkgs.master.pkgsi686Linux.mesa.drivers;
|
||||
};
|
||||
nvidia = {
|
||||
package = config.boot.kernelPackages.nvidia_x11_vulkan_beta;
|
||||
|
17
hosts/satori/mesa-vulkan-layer-nvidia.patch
Normal file
17
hosts/satori/mesa-vulkan-layer-nvidia.patch
Normal file
@@ -0,0 +1,17 @@
|
||||
diff --color -u -r b/src/vulkan/device-select-layer/device_select_layer.c a/src/vulkan/device-select-layer/device_select_layer.c
|
||||
--- b/src/vulkan/device-select-layer/device_select_layer.c 2022-03-22 11:18:04.309569433 +0530
|
||||
+++ a/src/vulkan/device-select-layer/device_select_layer.c 2022-03-22 11:18:17.944644235 +0530
|
||||
@@ -454,12 +454,8 @@
|
||||
exit(0);
|
||||
} else {
|
||||
unsigned selected_index = get_default_device(info, selection, physical_device_count, physical_devices);
|
||||
- selected_physical_device_count = physical_device_count;
|
||||
+ selected_physical_device_count = 1;
|
||||
selected_physical_devices[0] = physical_devices[selected_index];
|
||||
- for (unsigned i = 0; i < physical_device_count - 1; ++i) {
|
||||
- unsigned this_idx = i < selected_index ? i : i + 1;
|
||||
- selected_physical_devices[i + 1] = physical_devices[this_idx];
|
||||
- }
|
||||
}
|
||||
|
||||
if (selected_physical_device_count == 0) {
|
@@ -44,6 +44,7 @@
|
||||
git = {
|
||||
enable = true;
|
||||
package = pkgs.master.git.override {
|
||||
doInstallCheck = false;
|
||||
sendEmailSupport = true;
|
||||
withManual = false;
|
||||
};
|
||||
|
Reference in New Issue
Block a user