Unverified Commit d3f42bd6 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #332464 from luftmensch-luftmensch/fastfetch_2.21.0

fastfetch: 2.20.0 -> 2.21.0
parents 087f3300 ca9a1876
Loading
Loading
Loading
Loading
+130 −119
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchFromGitHub
, chafa
, cmake
, darwin
, dbus
, dconf
, ddcutil
, glib
, hwdata
, imagemagick_light
, libXrandr
, libdrm
, libglvnd
, libpulseaudio
, libselinux
, libsepol
, libxcb
, makeBinaryWrapper
, networkmanager
, nix-update-script
, ocl-icd
, opencl-headers
, overrideSDK
, pcre
, pcre2
, pkg-config
, python3
, rpm
, sqlite
, testers
, util-linux
, vulkan-loader
, wayland
, xfce
, xorg
, yyjson
, zlib
, rpmSupport ? false
, vulkanSupport ? true
, waylandSupport ? true
, x11Support ? true
{
  lib,
  stdenv,
  fetchFromGitHub,
  chafa,
  cmake,
  darwin,
  dbus,
  dconf,
  ddcutil,
  glib,
  hwdata,
  imagemagick_light,
  libXrandr,
  libdrm,
  libglvnd,
  libpulseaudio,
  libselinux,
  libsepol,
  libxcb,
  makeBinaryWrapper,
  nix-update-script,
  ocl-icd,
  opencl-headers,
  overrideSDK,
  pcre,
  pcre2,
  pkg-config,
  python3,
  rpm,
  sqlite,
  testers,
  util-linux,
  vulkan-loader,
  wayland,
  xfce,
  xorg,
  yyjson,
  zlib,
  rpmSupport ? false,
  vulkanSupport ? true,
  waylandSupport ? true,
  x11Support ? true,
}:
let
  stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
in
stdenv'.mkDerivation (finalAttrs: {
  pname = "fastfetch";
  version = "2.20.0";
  version = "2.21.0";

  src = fetchFromGitHub {
    owner = "fastfetch-cli";
    repo = "fastfetch";
    rev = finalAttrs.version;
    hash = "sha256-8N2BG9eTZpAvnc1wiG6p7GJSCPfZ+NTbz8kLGPRg5HU=";
    hash = "sha256-1bWWwMzbzECWARhl3ULMVF5QhbvrV5ShVT382BnRGg8=";
  };

  outputs = [ "out" "man" ];
  outputs = [
    "out"
    "man"
  ];

  nativeBuildInputs = [
    cmake
@@ -65,14 +68,16 @@ stdenv'.mkDerivation (finalAttrs: {
    python3
  ];

  buildInputs = [
  buildInputs =
    [
      chafa
      imagemagick_light
      pcre
      pcre2
      sqlite
      yyjson
  ] ++ lib.optionals stdenv.isLinux [
    ]
    ++ lib.optionals stdenv.isLinux [
      dbus
      dconf
      ddcutil
@@ -82,27 +87,26 @@ stdenv'.mkDerivation (finalAttrs: {
      libpulseaudio
      libselinux
      libsepol
    networkmanager
      ocl-icd
      opencl-headers
      util-linux
      zlib
  ] ++ lib.optionals rpmSupport [
    rpm
  ] ++ lib.optionals vulkanSupport [
    vulkan-loader
  ] ++ lib.optionals waylandSupport [
    wayland
  ] ++ lib.optionals x11Support [
    ]
    ++ lib.optionals rpmSupport [ rpm ]
    ++ lib.optionals vulkanSupport [ vulkan-loader ]
    ++ lib.optionals waylandSupport [ wayland ]
    ++ lib.optionals x11Support [
      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; [
    ]
    ++ lib.optionals (x11Support && (!stdenv.isDarwin)) [ xfce.xfconf ]
    ++ lib.optionals stdenv.isDarwin (
      with darwin.apple_sdk_11_0.frameworks;
      [
        Apple80211
        AppKit
        AVFoundation
@@ -116,9 +120,11 @@ stdenv'.mkDerivation (finalAttrs: {
        OpenCL
        SystemConfiguration
        darwin.moltenvk
  ]);
      ]
    );

  cmakeFlags = [
  cmakeFlags =
    [
      (lib.cmakeOptionType "filepath" "CMAKE_INSTALL_SYSCONFDIR" "${placeholder "out"}/etc")
      (lib.cmakeBool "ENABLE_DIRECTX_HEADERS" false)
      (lib.cmakeBool "ENABLE_DRM" false)
@@ -134,7 +140,8 @@ stdenv'.mkDerivation (finalAttrs: {
      (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support)
      (lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.isDarwin)))
      (lib.cmakeBool "ENABLE_XRANDR" x11Support)
  ] ++ lib.optionals stdenv.isLinux [
    ]
    ++ lib.optionals stdenv.isLinux [
      (lib.cmakeOptionType "filepath" "CUSTOM_PCI_IDS_PATH" "${hwdata}/share/hwdata/pci.ids")
      (lib.cmakeOptionType "filepath" "CUSTOM_AMDGPU_IDS_PATH" "${libdrm}/share/libdrm/amdgpu.ids")
    ];
@@ -162,8 +169,12 @@ stdenv'.mkDerivation (finalAttrs: {
  meta = {
    description = "Like neofetch, but much faster because written in C";
    homepage = "https://github.com/fastfetch-cli/fastfetch";
    changelog = "https://github.com/fastfetch-cli/fastfetch/releases/tag/${finalAttrs.version}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ khaneliman ];
    maintainers = with lib.maintainers; [
      luftmensch-luftmensch
      khaneliman
    ];
    platforms = lib.platforms.all;
    mainProgram = "fastfetch";
  };