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.

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

libreoffice-still: 7.1.8.1 -> 7.2.6.2 #172046

Merged
merged 2 commits into from
May 9, 2022

Conversation

gador
Copy link
Member

@gador gador commented May 8, 2022

Description of changes

Update to supported libreoffice release

Changelog

fixes #171907

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).

Result of nixpkgs-review run on x86_64-linux 1

11 packages built:
  • jpsxdec
  • libreoffice (libreoffice-still)
  • libreoffice-still-unwrapped
  • openlp
  • openlpFull
  • paperwork
  • python310Packages.paperwork-backend
  • python310Packages.paperwork-shell
  • python39Packages.paperwork-backend
  • python39Packages.paperwork-shell
  • unoconv

@gador gador requested review from jtojnar and fogti May 8, 2022 19:41
@gador gador mentioned this pull request May 8, 2022
13 tasks
Copy link
Contributor

@fogti fogti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not involved enough to gauge if the download.nix modifications are fine, but the rest looks LGTM.

@gador
Copy link
Member Author

gador commented May 8, 2022

the provided script was used to update download.nix if that helps

Comment on lines -10 to +9
"--without-system-qrcodegen"
"--without-system-zxing"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we not using the system libraries?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the system library is missing a header file and libreoffice won't compile.
It ships its own version of zxing (which is found in the long download.nix file)

Copy link
Member

@alexshpilkin alexshpilkin May 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that the system zxing-cpp is not missing anything and just has its .pc file screwed up, I’ll have a look.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouch, this is worse than I thought. KhronosGroup/SPIRV-Tools#3905 is a similar bug from October 2020 that concerns broken pkg-config files when CMAKE_INSTALL_{INCLUDE,LIB}DIR is absolute (and with the Nixpkgs CMake tooling it is), it’s still unfixed, and the .pc files for spirv-tools in Nixpkgs are similarly broken. Honestly it seems like .pc files in all CMake-built projects should be suspect.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah. interesting. Thanks for clearing that up. When building with the nixos zxing it just complained about a barcode header file not found.
Libreoffice compiles with its own version correctly though 👍

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gador see #172150 for my attempt at killing the outdated custom zxing (but my machine is likely too puny to build libreoffice so I haven’t tried that yet)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of using some version that they vendored which could be missing patches, updates and nixos workaround we should use our version again especially if the pc file bug is fixed.

@7c6f434c 7c6f434c merged commit 9f571ba into NixOS:master May 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

libreoffice 7.1.8.1 fails to build
6 participants