diff options
| -rw-r--r-- | nixos/modules/config/no-x-libs.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/misc/fastfetch/default.nix | 24 |
2 files changed, 17 insertions, 8 deletions
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index a50a03ce52d4..ede41747317e 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -30,6 +30,7 @@ with lib; beam = super.beam_nox; cairo = super.cairo.override { x11Support = false; }; dbus = super.dbus.override { x11Support = false; }; + fastfetch = super.fastfetch.override { 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 2e5b5714827d..a2ebc67e4191 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -28,6 +28,7 @@ , xfce , yyjson , zlib +, x11Support ? true }: stdenv.mkDerivation (finalAttrs: { @@ -58,10 +59,7 @@ stdenv.mkDerivation (finalAttrs: { dconf ddcutil glib - libglvnd libpulseaudio - libxcb - libXrandr networkmanager ocl-icd opencl-headers @@ -69,10 +67,14 @@ stdenv.mkDerivation (finalAttrs: { rpm vulkan-loader wayland - xfce.xfconf zlib - ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ + ] ++ lib.optionals x11Support [ + libXrandr + libglvnd + libxcb + ] ++ lib.optionals (x11Support && (!stdenv.isDarwin)) [ + xfce.xfconf + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Apple80211 AppKit Cocoa @@ -88,8 +90,14 @@ stdenv.mkDerivation (finalAttrs: { ]); cmakeFlags = [ - "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc" - "-DENABLE_SYSTEM_YYJSON=YES" + (lib.cmakeOptionType "filepath" "CMAKE_INSTALL_SYSCONFDIR" "${placeholder "out"}/etc") + (lib.cmakeBool "ENABLE_SYSTEM_YYJSON" true) + (lib.cmakeBool "ENABLE_GLX" x11Support) + (lib.cmakeBool "ENABLE_X11" x11Support) + (lib.cmakeBool "ENABLE_XCB" x11Support) + (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support) + (lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.isDarwin))) + (lib.cmakeBool "ENABLE_XRANDR" x11Support) ]; env.NIX_CFLAGS_COMPILE = toString [ |