From dcebda8c153510bfb94a15a26b98254efd887320 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 2 Apr 2024 22:15:27 +0200 Subject: [PATCH 1/2] monado-vulkan-layers: init at 0-unstable-2024-02-21 Signed-off-by: Sefa Eyeoglu Co-authored-by: PassiveLemon --- .../absolute-layer-path.patch | 12 +++++ .../mo/monado-vulkan-layers/package.nix | 44 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/by-name/mo/monado-vulkan-layers/absolute-layer-path.patch create mode 100644 pkgs/by-name/mo/monado-vulkan-layers/package.nix diff --git a/pkgs/by-name/mo/monado-vulkan-layers/absolute-layer-path.patch b/pkgs/by-name/mo/monado-vulkan-layers/absolute-layer-path.patch new file mode 100644 index 000000000000..60784fc7ec9d --- /dev/null +++ b/pkgs/by-name/mo/monado-vulkan-layers/absolute-layer-path.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d9a1b56..9a07e69 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,6 +41,7 @@ generate_vulkan_api_layer_manifest_at_install( + RELATIVE_LAYER_DIR ${LAYER_INSTALLDIR} + DESTINATION ${CMAKE_INSTALL_DATADIR}/vulkan/implicit_layer.d + COMPONENT vulkan_layer ++ ABSOLUTE_LAYER_PATH + ) + + set(CPACK_COMPONENT_vulkan_layer_DISPLAY_NAME "Timeline Semaphore Vulkan Implicit Layer") diff --git a/pkgs/by-name/mo/monado-vulkan-layers/package.nix b/pkgs/by-name/mo/monado-vulkan-layers/package.nix new file mode 100644 index 000000000000..820a07d5d9b2 --- /dev/null +++ b/pkgs/by-name/mo/monado-vulkan-layers/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitLab, + cmake, + vulkan-headers, + vulkan-loader, +}: +stdenv.mkDerivation { + pname = "monado-vulkan-layers"; + version = "0-unstable-2024-02-21"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "monado"; + repo = "utilities/vulkan-layers"; + rev = "ae43cdcbd25c56e3481bbc8a0ce2bfcebba9f7c2"; + sha256 = "sha256-QabYVKcenW+LQ+QSjUoQOLOQAVHdjE0YXd+1WsdzNPc="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + vulkan-headers + vulkan-loader + ]; + + patches = [ + ./absolute-layer-path.patch + ]; + + meta = with lib; { + description = "Vulkan Layers for Monado"; + homepage = "https://gitlab.freedesktop.org/monado/utilities/vulkan-layers"; + platforms = platforms.linux; + license = licenses.boost; + maintainers = with maintainers; [ + Scrumplex + passivelemon + ]; + }; +} From 0642aa2f53748a29834a897f2cdb391762d621f6 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 2 Apr 2024 22:34:34 +0200 Subject: [PATCH 2/2] nixos/monado: install monado-vulkan-layers Signed-off-by: Sefa Eyeoglu --- nixos/modules/services/hardware/monado.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/hardware/monado.nix b/nixos/modules/services/hardware/monado.nix index 9f9c6c39a0b4..9140683df34c 100644 --- a/nixos/modules/services/hardware/monado.nix +++ b/nixos/modules/services/hardware/monado.nix @@ -93,6 +93,8 @@ in environment.systemPackages = [ cfg.package ]; environment.pathsToLink = [ "/share/openxr" ]; + hardware.opengl.extraPackages = [ pkgs.monado-vulkan-layers ]; + environment.etc."xdg/openxr/1/active_runtime.json" = mkIf cfg.defaultRuntime { source = "${cfg.package}/share/openxr/1/openxr_monado.json"; };