cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #265033 from khaneliman/fastfetch

Browse source 
fastfetch: 2.2.0 -> 2.2.1
This commit is contained in:
Ilan Joselevich 2023-11-03 12:13:05 +00:00 committed by GitHub
commit 85713068d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix
View file

@ -2,6 +2,7 @@
# generated by hand to avoid exposing all private frameworks # generated by hand to avoid exposing all private frameworks
# frameworks here are only the necessary ones used by public frameworks. # frameworks here are only the necessary ones used by public frameworks.
{ {
Apple80211 = {};
AVFCapture = {}; AVFCapture = {};
AVFCore = {}; AVFCore = {};
AddressBookCore = { inherit ContactsPersistence; }; AddressBookCore = { inherit ContactsPersistence; };

11
pkgs/tools/misc/fastfetch/default.nix
View file

@ -27,6 +27,7 @@
, xfce , xfce
, yyjson , yyjson
, zlib , zlib
, Apple80211
, AppKit , AppKit
, Cocoa , Cocoa
, CoreDisplay , CoreDisplay
@ -42,13 +43,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "fastfetch"; pname = "fastfetch";
version = "2.2.0"; version = "2.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fastfetch-cli"; owner = "fastfetch-cli";
repo = "fastfetch"; repo = "fastfetch";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-H2iIL41h3o8184S/XMYAuIDPVJPm+zSI/YX8FT8vLio="; hash = "sha256-7g2p33j97hu26xwBLrakc7/bIpYHNTC5jqCj/Fs4fKo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -83,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
zlib zlib
] ]
++ lib.optionals stdenv.isDarwin [ ++ lib.optionals stdenv.isDarwin [
Apple80211
AppKit AppKit
Cocoa Cocoa
CoreDisplay CoreDisplay
@ -101,6 +103,11 @@ stdenv.mkDerivation (finalAttrs: {
"-DENABLE_SYSTEM_YYJSON=YES" "-DENABLE_SYSTEM_YYJSON=YES"
]; ];
env.NIX_CFLAGS_COMPILE = toString [
# Needed with GCC 12
"-Wno-error=uninitialized"
];
postInstall = '' postInstall = ''
wrapProgram $out/bin/fastfetch \ wrapProgram $out/bin/fastfetch \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"

2
pkgs/top-level/all-packages.nix
View file

@ -1770,7 +1770,7 @@ with pkgs;
fastfetch = darwin.apple_sdk_11_0.callPackage ../tools/misc/fastfetch { fastfetch = darwin.apple_sdk_11_0.callPackage ../tools/misc/fastfetch {
inherit (darwin.apple_sdk_11_0.frameworks) inherit (darwin.apple_sdk_11_0.frameworks)
AppKit Cocoa CoreDisplay CoreVideo CoreWLAN DisplayServices AppKit Apple80211 Cocoa CoreDisplay CoreVideo CoreWLAN DisplayServices
Foundation IOBluetooth MediaRemote OpenCL; Foundation IOBluetooth MediaRemote OpenCL;
inherit (darwin) moltenvk; inherit (darwin) moltenvk;