Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fastfetch: switch to apple-sdk_15 #352623

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+14 −33
Open

fastfetch: switch to apple-sdk_15 #352623

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da69ec3
fastfetch: switch to apple-sdk_11
khaneliman Oct 31, 2024
8db6952
fastfetch: apple-sdk_11 -> apple-sdk_15
khaneliman Oct 31, 2024
bd0f990
fastfetch: use versionCheckHook
khaneliman Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 14 additions & 33 deletions pkgs/by-name/fa/fastfetch/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
lib,
stdenv,
fetchFromGitHub,
apple-sdk_15,
chafa,
cmake,
darwin,
darwinMinVersionHook,
dbus,
dconf,
ddcutil,
Expand All @@ -23,15 +24,14 @@
nix-update-script,
ocl-icd,
opencl-headers,
overrideSDK,
pcre,
pcre2,
pkg-config,
python3,
rpm,
sqlite,
testers,
util-linux,
versionCheckHook,
vulkan-loader,
wayland,
xfce,
Expand All @@ -43,10 +43,7 @@
waylandSupport ? true,
x11Support ? true,
}:
let
stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
in
stdenv'.mkDerivation (finalAttrs: {
stdenv.mkDerivation (finalAttrs: {
pname = "fastfetch";
version = "2.28.0";

Expand Down Expand Up @@ -105,24 +102,11 @@ stdenv'.mkDerivation (finalAttrs: {
xorg.libXext
]
++ lib.optionals (x11Support && (!stdenv.hostPlatform.isDarwin)) [ xfce.xfconf ]
++ lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk_11_0.frameworks;
[
Apple80211
AppKit
AVFoundation
Cocoa
CoreDisplay
CoreVideo
CoreWLAN
DisplayServices
IOBluetooth
MediaRemote
OpenCL
SystemConfiguration
moltenvk
]
);
++ lib.optionals stdenv.hostPlatform.isDarwin ([
apple-sdk_15
moltenvk
(darwinMinVersionHook "10.13")
]);

cmakeFlags =
[
Expand Down Expand Up @@ -158,14 +142,11 @@ stdenv'.mkDerivation (finalAttrs: {
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
'';

passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "fastfetch -v | cut -d '(' -f 1";
version = "fastfetch ${finalAttrs.version}";
};
};
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
doInstallCheck = true;

passthru.updateScript = nix-update-script { };

meta = {
description = "An actively maintained, feature-rich and performance oriented, neofetch like system information tool";
Expand Down