From 556b8c7b6f2034fa8ec60c1b91c7b0d23ffc0968 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 4 Feb 2024 21:53:52 +0300 Subject: fastfetch: add x11Support option --- pkgs/tools/misc/fastfetch/default.nix | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'pkgs/tools') 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 [ -- cgit 1.4.1 From 69206539d4c9c613855063b0e56ff521fa73a91b Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 5 Feb 2024 01:23:29 +0300 Subject: fastfetch: add waylandSupport option --- nixos/modules/config/no-x-libs.nix | 2 +- pkgs/tools/misc/fastfetch/default.nix | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index ede41747317e..f03c055a6e1d 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 { x11Support = false; }; + fastfetch = super.fastfetch.override { 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 a2ebc67e4191..bcbdecd6d000 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -28,6 +28,7 @@ , xfce , yyjson , zlib +, waylandSupport ? true , x11Support ? true }: @@ -66,8 +67,9 @@ stdenv.mkDerivation (finalAttrs: { pciutils rpm vulkan-loader - wayland zlib + ] ++ lib.optionals waylandSupport [ + wayland ] ++ lib.optionals x11Support [ libXrandr libglvnd @@ -93,6 +95,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_WAYLAND" waylandSupport) (lib.cmakeBool "ENABLE_X11" x11Support) (lib.cmakeBool "ENABLE_XCB" x11Support) (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support) -- cgit 1.4.1 From 15dfbbd4c3a6e596b665c308058a63f6e4236c92 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 5 Feb 2024 01:25:46 +0300 Subject: 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(-) (limited to 'pkgs/tools') 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) -- cgit 1.4.1 From 4cdd48107486e728a85a8cd0977ba54846c79778 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 5 Feb 2024 01:34:08 +0300 Subject: fastfetch: add rpmSupport option --- pkgs/tools/misc/fastfetch/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 0c212f1dcc38..d3294c3be0b3 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -28,6 +28,7 @@ , xfce , yyjson , zlib +, rpmSupport ? false , vulkanSupport ? true , waylandSupport ? true , x11Support ? true @@ -66,8 +67,9 @@ stdenv.mkDerivation (finalAttrs: { ocl-icd opencl-headers pciutils - rpm zlib + ] ++ lib.optionals rpmSupport [ + rpm ] ++ lib.optionals vulkanSupport [ vulkan-loader ] ++ lib.optionals waylandSupport [ @@ -97,6 +99,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_RPM" rpmSupport) (lib.cmakeBool "ENABLE_VULKAN" x11Support) (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport) (lib.cmakeBool "ENABLE_X11" x11Support) -- cgit 1.4.1 From 40be3d6fdabc2d4bb3bc473bd67af4552fbd0807 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 5 Feb 2024 01:40:33 +0300 Subject: fastfetch: add required packages --- pkgs/tools/misc/fastfetch/default.nix | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index d3294c3be0b3..f772376d6ee6 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -9,23 +9,30 @@ , ddcutil , glib , imagemagick_light +, libXrandr , libglvnd , libpulseaudio +, libselinux +, libsepol , libxcb -, libXrandr , makeBinaryWrapper , networkmanager , nix-update-script , ocl-icd , opencl-headers , pciutils +, pcre +, pcre2 , pkg-config +, python3 , rpm , sqlite , testers +, util-linux , vulkan-loader , wayland , xfce +, xorg , yyjson , zlib , rpmSupport ? false @@ -49,24 +56,29 @@ stdenv.mkDerivation (finalAttrs: { cmake makeBinaryWrapper pkg-config + python3 ]; buildInputs = [ chafa imagemagick_light + pcre + pcre2 sqlite yyjson - ] - ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ dbus dconf ddcutil glib libpulseaudio + libselinux + libsepol networkmanager ocl-icd opencl-headers pciutils + util-linux zlib ] ++ lib.optionals rpmSupport [ rpm @@ -78,6 +90,9 @@ stdenv.mkDerivation (finalAttrs: { libXrandr libglvnd libxcb + xorg.libXau + xorg.libXdmcp + xorg.libXext ] ++ lib.optionals (x11Support && (!stdenv.isDarwin)) [ xfce.xfconf ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ @@ -97,6 +112,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeOptionType "filepath" "CMAKE_INSTALL_SYSCONFDIR" "${placeholder "out"}/etc") + (lib.cmakeBool "ENABLE_DIRECTX_HEADERS" false) + (lib.cmakeBool "ENABLE_DRM" false) + (lib.cmakeBool "ENABLE_IMAGEMAGICK6" false) + (lib.cmakeBool "ENABLE_OSMESA" false) (lib.cmakeBool "ENABLE_SYSTEM_YYJSON" true) (lib.cmakeBool "ENABLE_GLX" x11Support) (lib.cmakeBool "ENABLE_RPM" rpmSupport) -- cgit 1.4.1 From 83045befd368b0038ba039161eaf917822213a86 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 5 Feb 2024 16:59:45 +0300 Subject: fastfetch: split man output --- pkgs/tools/misc/fastfetch/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index f772376d6ee6..de33eb5800f0 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -52,6 +52,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-s0N3Rt3lLOCyaeXeNYu6hlGtNtGR+YC7Aj4/3SeVMpQ="; }; + outputs = [ "out" "man" ]; + nativeBuildInputs = [ cmake makeBinaryWrapper -- cgit 1.4.1