Merge pull request #265033 from khaneliman/fastfetch
fastfetch: 2.2.0 -> 2.2.1
This commit is contained in:
commit
85713068d9
3 changed files with 11 additions and 3 deletions
|
@ -2,6 +2,7 @@
|
|||
# generated by hand to avoid exposing all private frameworks
|
||||
# frameworks here are only the necessary ones used by public frameworks.
|
||||
{
|
||||
Apple80211 = {};
|
||||
AVFCapture = {};
|
||||
AVFCore = {};
|
||||
AddressBookCore = { inherit ContactsPersistence; };
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
, xfce
|
||||
, yyjson
|
||||
, zlib
|
||||
, Apple80211
|
||||
, AppKit
|
||||
, Cocoa
|
||||
, CoreDisplay
|
||||
|
@ -42,13 +43,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-H2iIL41h3o8184S/XMYAuIDPVJPm+zSI/YX8FT8vLio=";
|
||||
hash = "sha256-7g2p33j97hu26xwBLrakc7/bIpYHNTC5jqCj/Fs4fKo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -83,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
zlib
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
Apple80211
|
||||
AppKit
|
||||
Cocoa
|
||||
CoreDisplay
|
||||
|
@ -101,6 +103,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"-DENABLE_SYSTEM_YYJSON=YES"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=uninitialized"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/fastfetch \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
|
||||
|
|
|
@ -1770,7 +1770,7 @@ with pkgs;
|
|||
|
||||
fastfetch = darwin.apple_sdk_11_0.callPackage ../tools/misc/fastfetch {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks)
|
||||
AppKit Cocoa CoreDisplay CoreVideo CoreWLAN DisplayServices
|
||||
AppKit Apple80211 Cocoa CoreDisplay CoreVideo CoreWLAN DisplayServices
|
||||
Foundation IOBluetooth MediaRemote OpenCL;
|
||||
|
||||
inherit (darwin) moltenvk;
|
||||
|
|
Loading…
Reference in a new issue