fastfetch: fix darwin x86

This commit is contained in:
Austin Horstman 2023-12-25 20:35:07 -06:00
parent 12b40cf56c
commit 807ddcc02c
No known key found for this signature in database
2 changed files with 7 additions and 22 deletions

View File

@ -3,6 +3,7 @@
, fetchFromGitHub
, chafa
, cmake
, darwin
, dbus
, dconf
, ddcutil
@ -27,18 +28,6 @@
, xfce
, yyjson
, zlib
, Apple80211
, AppKit
, Cocoa
, CoreDisplay
, CoreVideo
, CoreWLAN
, DisplayServices
, Foundation
, IOBluetooth
, MediaRemote
, OpenCL
, moltenvk
}:
stdenv.mkDerivation (finalAttrs: {
@ -83,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
xfce.xfconf
zlib
]
++ lib.optionals stdenv.isDarwin [
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
Apple80211
AppKit
Cocoa
@ -91,12 +80,12 @@ stdenv.mkDerivation (finalAttrs: {
CoreVideo
CoreWLAN
DisplayServices
Foundation
IOBluetooth
MediaRemote
OpenCL
moltenvk
];
SystemConfiguration
darwin.moltenvk
]);
cmakeFlags = [
"-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc"

View File

@ -1808,12 +1808,8 @@ with pkgs;
etlegacy = callPackage ../games/etlegacy { lua = lua5_4; };
fastfetch = darwin.apple_sdk_11_0.callPackage ../tools/misc/fastfetch {
inherit (darwin.apple_sdk_11_0.frameworks)
AppKit Apple80211 Cocoa CoreDisplay CoreVideo CoreWLAN DisplayServices
Foundation IOBluetooth MediaRemote OpenCL;
inherit (darwin) moltenvk;
fastfetch = callPackage ../tools/misc/fastfetch {
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
fscan = callPackage ../tools/security/fscan { };