[PATCH 0/4] fastfetch: Unbundle yyjson and package improvements

Hi Guix,

This little patch series removes the bundled yyjson from fastfetch and adds more configure options to make the package work better with guix.

The most significant change is switching to dynamically linking against the optional dependencies of fastfetch (instead of dlopening them at runtime) to avoid manually writing out a wrapper setting LD_LIBRARY_PATH.

Finally there is an update to the latest version.

With the 2.17.0 release the option "ENABLE_PROPRIETARY_GPU_DRIVER_API" was removed (https://github.com/fastfetch-cli/fastfetch/blob/dev/CHANGELOG.md#2170).Is that a problem with FSDG?

Dariqq (4):

gnu: Add yyjson.

gnu: fastfetch: Unbundle yyjson.

gnu: fastfetch: Add more configure flags.

gnu: fastfetch: Update to 2.17.2.

gnu/packages/admin.scm | 25 +++++++++++++++++++++----

gnu/packages/c.scm | 38 ++++++++++++++++++++++++++++++++++++++

2 files changed, 59 insertions(+), 4 deletions(-)

base-commit: 5905b4728776d6a6e6e5587f46fc0d633df6907c

--

2.45.2

Change-Id: Ica9ff2e1b6676aa8761eb33cbab76154f17e443f

---

gnu/packages/c.scm | 38 ++++++++++++++++++++++++++++++++++++++

1 file changed, 38 insertions(+)

Most importantly the dependencies are now linked dynamically to avoid writing out a

LD_LIBRARY_PATH wrapper.

Also build the tests and skip installing the license file.

Additionally provide custom paths to pci-ids and amdgpu-ids.

(arguments): Move above inputs.

[#:configure-flags]: Add -DBUILD_TESTS=ON, -DINSTALL_LICENSE=OFF,

-DBINARY_LINK_TYPE=dynamic and set -DCUSTOM_PCI_IDS_PATH and

-DCUSTOM_AMDGPU_IDS_PATH.

[#:tests]: Remove as now there are tests available.

[inputs]: Add hwdata and libdrm for the custom paths.

Change-Id: I9f86b49f0a116bcee91ca15b6e77cfbb3867e290

---

gnu/packages/admin.scm | 17 ++++++++++++++---

1 file changed, 14 insertions(+), 3 deletions(-)

Also add python to minify the help.json file at build time.

[native-inputs]: Add python.

Change-Id: I135be0447061896ec2f133e11d50ced92b9e79b5

---

gnu/packages/admin.scm | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

[origin]: Add snippet to remove third party code.

[#_configure-flags]: Add "-DENABLE_SYSTEM_YYJSON=YES"

[inputs]: Add yyjson.

Change-Id: I8175b8f4a8d55ff3b9d5fa4cb99f1fc1ad15fd97

---

gnu/packages/admin.scm | 10 ++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)

Hi Guix,

This little patch series removes the bundled yyjson from fastfetch and adds more configure options to make the package work better with guix.

The most significant change is switching to dynamically linking against the optional dependencies of fastfetch (instead of dlopening them at runtime) to avoid manually writing out a wrapper setting LD_LIBRARY_PATH.

Finally there is an update to the latest version.

With the 2.17.0 release the option "ENABLE_PROPRIETARY_GPU_DRIVER_API" was removed (https://github.com/fastfetch-cli/fastfetch/blob/dev/CHANGELOG.md#2170).Isthat a problem with FSDG?

Changes in v2:

Update to the latest fastfetch release which also needs a newer yyjson.

Dariqq (5):

gnu: Add yyjson.

gnu: fastfetch: Unbundle yyjson.

gnu: fastfetch: Add more configure flags.

gnu: yyjson: Update to 0.10.0.

gnu: fastfetch: Update to 2.18.1.

gnu/packages/admin.scm | 23 ++++++++++++++++++++---

gnu/packages/c.scm | 38 ++++++++++++++++++++++++++++++++++++++

2 files changed, 58 insertions(+), 3 deletions(-)

base-commit: c1d367f57e89c3f2efd964e6d638bd89b0b1df97

--

2.45.2

Change-Id: Ica9ff2e1b6676aa8761eb33cbab76154f17e443f

---

gnu/packages/c.scm | 38 ++++++++++++++++++++++++++++++++++++++

1 file changed, 38 insertions(+)

Most importantly the dependencies are now linked dynamically to avoid writing out a

LD_LIBRARY_PATH wrapper.

Also build the tests and skip installing the license file.

Additionally provide custom paths to pci-ids and amdgpu-ids.

(arguments): Move above inputs.

[#:configure-flags]: Add -DBUILD_TESTS=ON, -DINSTALL_LICENSE=OFF,

-DBINARY_LINK_TYPE=dynamic and set -DCUSTOM_PCI_IDS_PATH and

-DCUSTOM_AMDGPU_IDS_PATH.

[#:tests]: Remove as now there are tests available.

[inputs]: Add hwdata and libdrm for the custom paths.

Change-Id: I9f86b49f0a116bcee91ca15b6e77cfbb3867e290

---

gnu/packages/admin.scm | 17 ++++++++++++++---

1 file changed, 14 insertions(+), 3 deletions(-)

Change-Id: Id8be82026eb0d102272b1128cce80a5609d309d0

---

gnu/packages/c.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

[origin]: Add snippet to remove third party code.

[#_configure-flags]: Add "-DENABLE_SYSTEM_YYJSON=YES"

[inputs]: Add yyjson.

Change-Id: I8175b8f4a8d55ff3b9d5fa4cb99f1fc1ad15fd97

---

gnu/packages/admin.scm | 10 ++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)

Change-Id: I257954b6f21f5a9fc35b45785f6addff604513b9

---

gnu/packages/admin.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Change-Id: Ica9ff2e1b6676aa8761eb33cbab76154f17e443f

---

gnu/packages/c.scm | 38 ++++++++++++++++++++++++++++++++++++++

1 file changed, 38 insertions(+)

[origin]: Add snippet to remove third party code.

[#:configure-flags]: Add "-DENABLE_SYSTEM_YYJSON=YES"

[inputs]: Add yyjson.

Change-Id: I8175b8f4a8d55ff3b9d5fa4cb99f1fc1ad15fd97

---

gnu/packages/admin.scm | 10 ++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)

Most importantly the dependencies are now linked dynamically to avoid writing out a

LD_LIBRARY_PATH wrapper.

Also build the tests and skip installing the license file.

Additionally provide custom paths to pci-ids and amdgpu-ids.

(arguments): Move above inputs.

[#:configure-flags]: Add -DBUILD_TESTS=ON, -DINSTALL_LICENSE=OFF,

-DBINARY_LINK_TYPE=dynamic and set -DCUSTOM_PCI_IDS_PATH and

-DCUSTOM_AMDGPU_IDS_PATH.

[#:tests]: Remove as now there are tests available.

[inputs]: Add hwdata and libdrm for the custom paths.

Change-Id: I9f86b49f0a116bcee91ca15b6e77cfbb3867e290

---

gnu/packages/admin.scm | 17 ++++++++++++++---

1 file changed, 14 insertions(+), 3 deletions(-)

Change-Id: Id8be82026eb0d102272b1128cce80a5609d309d0

---

gnu/packages/c.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Change-Id: I5f672fdc0cc36ceb7e32dbb2e5edc7ca212131e6

---

gnu/packages/admin.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

[origin]: Add snippet to remove third party code.

[#:configure-flags]: Add "-DENABLE_SYSTEM_YYJSON=YES"

[inputs]: Add yyjson.

Change-Id: I8175b8f4a8d55ff3b9d5fa4cb99f1fc1ad15fd97

---

gnu/packages/admin.scm | 10 ++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)

Change-Id: Ica9ff2e1b6676aa8761eb33cbab76154f17e443f

---

gnu/packages/c.scm | 38 ++++++++++++++++++++++++++++++++++++++

1 file changed, 38 insertions(+)

Change-Id: Id8be82026eb0d102272b1128cce80a5609d309d0

---

gnu/packages/c.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Also add python-minimal to minify the help.json file at build time.

[native-inputs]: Add python-minimal.

Change-Id: I52d5cf244726bf4362f658f818094a483e3b3d01

---

gnu/packages/admin.scm | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

Most importantly the dependencies are now linked dynamically to avoid writing out a

LD_LIBRARY_PATH wrapper.

Also build the tests and skip installing the license file.

Additionally provide custom paths to pci-ids and amdgpu-ids.

(arguments): Move above inputs.

[#:configure-flags]: Add -DBUILD_TESTS=ON, -DINSTALL_LICENSE=OFF,

-DBINARY_LINK_TYPE=dynamic and set -DCUSTOM_PCI_IDS_PATH and

-DCUSTOM_AMDGPU_IDS_PATH.

[#:tests]: Remove as now there are tests available.

[inputs]: Add hwdata and libdrm for the custom paths.

Change-Id: I9f86b49f0a116bcee91ca15b6e77cfbb3867e290

---

gnu/packages/admin.scm | 17 ++++++++++++++---

1 file changed, 14 insertions(+), 3 deletions(-)

Change-Id: Ica9ff2e1b6676aa8761eb33cbab76154f17e443f

---

gnu/packages/c.scm | 38 ++++++++++++++++++++++++++++++++++++++

1 file changed, 38 insertions(+)

Change-Id: Id8be82026eb0d102272b1128cce80a5609d309d0

---

gnu/packages/c.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Also add python-minimal to minify the help.json file at build time.

[native-inputs]: Add python-minimal.

Change-Id: I52d5cf244726bf4362f658f818094a483e3b3d01

---

gnu/packages/admin.scm | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

[origin]: Add snippet to remove third party code.

[#:configure-flags]: Add "-DENABLE_SYSTEM_YYJSON=YES"

[inputs]: Add yyjson.

Change-Id: I8175b8f4a8d55ff3b9d5fa4cb99f1fc1ad15fd97

---

gnu/packages/admin.scm | 10 ++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)

Most importantly the dependencies are now linked dynamically to avoid writing out a

LD_LIBRARY_PATH wrapper.

Also build the tests and skip installing the license file.

Additionally provide custom paths to pci-ids and amdgpu-ids.

(arguments): Move above inputs.

[#:configure-flags]: Add -DBUILD_TESTS=ON, -DINSTALL_LICENSE=OFF,

-DBINARY_LINK_TYPE=dynamic and set -DCUSTOM_PCI_IDS_PATH and

-DCUSTOM_AMDGPU_IDS_PATH.

[#:tests]: Remove as now there are tests available.

[inputs]: Add hwdata and libdrm for the custom paths.

Change-Id: I9f86b49f0a116bcee91ca15b6e77cfbb3867e290

---

gnu/packages/admin.scm | 17 ++++++++++++++---

1 file changed, 14 insertions(+), 3 deletions(-)

Change-Id: Ica9ff2e1b6676aa8761eb33cbab76154f17e443f

---

gnu/packages/c.scm | 38 ++++++++++++++++++++++++++++++++++++++

1 file changed, 38 insertions(+)

[origin]: Add snippet to remove third party code.

[#:configure-flags]: Add "-DENABLE_SYSTEM_YYJSON=ON"

[inputs]: Add yyjson.

Change-Id: I8175b8f4a8d55ff3b9d5fa4cb99f1fc1ad15fd97

---

gnu/packages/admin.scm | 10 ++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)

Most importantly the dependencies are now linked dynamically to avoid writing out a

LD_LIBRARY_PATH wrapper.

Also build the tests and skip installing the license file.

Additionally provide custom paths to pci-ids and amdgpu-ids.

(arguments): Move above inputs.

[#:configure-flags]: Add -DBUILD_TESTS=ON, -DINSTALL_LICENSE=OFF,

-DBINARY_LINK_TYPE=dynamic and set -DCUSTOM_PCI_IDS_PATH and

-DCUSTOM_AMDGPU_IDS_PATH.

[#:tests]: Remove as now there are tests available.

[inputs]: Add hwdata and libdrm for the custom paths.

Change-Id: I9f86b49f0a116bcee91ca15b6e77cfbb3867e290

---

gnu/packages/admin.scm | 17 ++++++++++++++---

1 file changed, 14 insertions(+), 3 deletions(-)

Change-Id: Id8be82026eb0d102272b1128cce80a5609d309d0

---

gnu/packages/c.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Also add python-minimal to minify the help.json file at build time.

Disable DIRECTX_HEADERS.

[#:configure-flags]: Add ENABLE_DIRECTX_HEADERS=OFF

[native-inputs]: Add python-minimal.

Change-Id: I52d5cf244726bf4362f658f818094a483e3b3d01

---

gnu/packages/admin.scm | 7 ++++---

1 file changed, 4 insertions(+), 3 deletions(-)

Use dynamic linking for dependencies instead of dlopening them at runtime which requries a wrapper with LD_LIBRARY_PATH.

Additionally provide custom paths to pci-ids and amdgpu-ids.

[#:configure-flags]: Enable dynamic linking and disable directx-headers. Set

custom paths to hwdata and libdrm.

[inputs]: Add hwdata and libdrm for the custom paths.

Change-Id: I9f86b49f0a116bcee91ca15b6e77cfbb3867e290

---

gnu/packages/admin.scm | 12 +++++++++++-

1 file changed, 11 insertions(+), 1 deletion(-)

In the rare case that someone is reading this, I rebased things again and bumped the fastfetch version to the latest version.

I simplified things a bit by doing the unbundling of yyjson and the package update in the same commit s.t. I don't have to add the previous yyjson version as well.

Look at 'fastfetch -c all --show-errors' and observe e.g.

Media: Failed to load DBus library

OpenGL: dlopen egl failed

To avoid writing out a wrapper for LD_LIBRARY_PATH I am changing to dynamic linking instead (which also makes it easier if others want to create a variant that has more stuff enabled)

Lastly overwriting the path to pci.ids and amdgpu.ids , the default paths assume a FHS layout.

Dariqq (3):

gnu: Add yyjson.

gnu: fastfetch: Update to 2.30.1.

gnu: fastfetch: Add more configure flags.

gnu/packages/admin.scm | 26 ++++++++++++++++++++++----

gnu/packages/c.scm | 38 ++++++++++++++++++++++++++++++++++++++

2 files changed, 60 insertions(+), 4 deletions(-)

base-commit: 129641fcd2956d6c571b792efe703da545f18c0a

--

2.46.0

[origin]: Add snippet to remove third party code.

[#:configure-flags]: Disable bundled yyjson, enable tests and skip installing license.

[native-inputs]: Add python-minimal.

[inputs]: Add yyjson.

Change-Id: I52d5cf244726bf4362f658f818094a483e3b3d01

---

gnu/packages/admin.scm | 16 ++++++++++++----

1 file changed, 12 insertions(+), 4 deletions(-)

Change-Id: Ica9ff2e1b6676aa8761eb33cbab76154f17e443f

---

gnu/packages/c.scm | 38 ++++++++++++++++++++++++++++++++++++++

1 file changed, 38 insertions(+)

Dariqq <dariqq@posteo.net> writes:

Just one observation, here you've written a null character where I'm

guessing you might want \\u0000 instead.

Hello Christopher,

On 29.12.24 12:29, Christopher Baines wrote:

Thanks for the hint.

I am not not sure if it is worth my time resending this for the eighth

time (despite the package currently violating guix packaging guidelines).

The latest fastfetch release

(https://github.com/fastfetch-cli/fastfetch/releases/tag/2.33.0)added a

new configure flag -DBUILD_FLASHFETCH=OFF which probably should be added

aswell)

Have a nice day,

Dariqq

In the rare case that someone is reading this, I rebased things once again again.

Look at 'fastfetch -c all --show-errors' and observe e.g.

Media: Failed to load DBus library

OpenGL: dlopen libEGL.so failed

To avoid writing out a wrapper for LD_LIBRARY_PATH I am changing to dynamic linking instead (which also makes it easier if others want to create a variant that has more stuff enabled).

Per the request of upstream [1] building of flashfetch is also disabled.

Lastly overwriting the path to pci.ids and amdgpu.ids , the default paths assume a FHS layout.

Also fixed the accidental null character in the yyjson descritpion.

[1] https://github.com/fastfetch-cli/fastfetch/releases/tag/2.33.0

Dariqq (3):

gnu: Add yyjson.

gnu: fastfetch: Update to 2.34.1.

gnu: fastfetch: Add more configure flags.

gnu/packages/admin.scm | 27 +++++++++++++++++++++++----

gnu/packages/c.scm | 38 ++++++++++++++++++++++++++++++++++++++

2 files changed, 61 insertions(+), 4 deletions(-)

base-commit: 9d7a9b6dc655ec6dd3cdb6f50fea1ca98f12fb8d

--

2.47.1

Change-Id: Ica9ff2e1b6676aa8761eb33cbab76154f17e443f

---

gnu/packages/c.scm | 38 ++++++++++++++++++++++++++++++++++++++

1 file changed, 38 insertions(+)

[origin]: Add snippet to remove third party code.

[#:configure-flags]: Disable bundled yyjson, disable flashfetch, enable tests and skip installing license.

[native-inputs]: Add python-minimal.

[inputs]: Add yyjson.

Change-Id: I52d5cf244726bf4362f658f818094a483e3b3d01

---

gnu/packages/admin.scm | 17 +++++++++++++----

1 file changed, 13 insertions(+), 4 deletions(-)

Use dynamic linking for dependencies instead of dlopening them at runtime which requries a wrapper with LD_LIBRARY_PATH.

Additionally provide custom paths to pci-ids and amdgpu-ids.

[#:configure-flags]: Enable dynamic linking and disable directx-headers. Set

custom paths to hwdata and libdrm.

[inputs]: Add hwdata and libdrm for the custom paths.

Change-Id: I9f86b49f0a116bcee91ca15b6e77cfbb3867e290

---

gnu/packages/admin.scm | 12 +++++++++++-

1 file changed, 11 insertions(+), 1 deletion(-)

Hi,

Thank you for your patience and work on nicely crafted patches!

I've reviewed them, applied some relaxation to description of jjson and

pushed as:

- 7eb3a5ac7dd * master gnu: fastfetch: Add more configure flags.

- a0b40f26cf4 * gnu: fastfetch: Update to 2.34.1.

- ab73372eec4 * gnu: Add yyjson.

Diff:

--

Thanks,

Oleg