From 15dfbbd4c3a6e596b665c308058a63f6e4236c92 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 5 Feb 2024 01:25:46 +0300 Subject: [PATCH] fastfetch: add vulkanSupport option --- nixos/modules/config/no-x-libs.nix | 2 +- pkgs/tools/misc/fastfetch/default.nix | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index f03c055a6e1d..2f763290e32d 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -30,7 +30,7 @@ with lib; beam = super.beam_nox; cairo = super.cairo.override { x11Support = false; }; dbus = super.dbus.override { x11Support = false; }; - fastfetch = super.fastfetch.override { waylandSupport = false; x11Support = false; }; + fastfetch = super.fastfetch.override { vulkanSupport = false; waylandSupport = false; x11Support = false; }; ffmpeg_4 = super.ffmpeg_4.override { ffmpegVariant = "headless"; }; ffmpeg_5 = super.ffmpeg_5.override { ffmpegVariant = "headless"; }; # dep of graphviz, libXpm is optional for Xpm support diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index bcbdecd6d000..0c212f1dcc38 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -28,6 +28,7 @@ , xfce , yyjson , zlib +, vulkanSupport ? true , waylandSupport ? true , x11Support ? true }: @@ -66,8 +67,9 @@ stdenv.mkDerivation (finalAttrs: { opencl-headers pciutils rpm - vulkan-loader zlib + ] ++ lib.optionals vulkanSupport [ + vulkan-loader ] ++ lib.optionals waylandSupport [ wayland ] ++ lib.optionals x11Support [ @@ -95,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeOptionType "filepath" "CMAKE_INSTALL_SYSCONFDIR" "${placeholder "out"}/etc") (lib.cmakeBool "ENABLE_SYSTEM_YYJSON" true) (lib.cmakeBool "ENABLE_GLX" x11Support) + (lib.cmakeBool "ENABLE_VULKAN" x11Support) (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport) (lib.cmakeBool "ENABLE_X11" x11Support) (lib.cmakeBool "ENABLE_XCB" x11Support)