-
-
Notifications
You must be signed in to change notification settings - Fork 14.6k
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
Conversation
fixes NixOS#171907 Signed-off-by: Florian Brandes <[email protected]>
Signed-off-by: Florian Brandes <[email protected]>
There was a problem hiding this 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.
the provided script was used to update |
"--without-system-qrcodegen" | ||
"--without-system-zxing" |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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)
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
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.
Description of changes
Update to supported libreoffice release
Changelog
fixes #171907
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notesThis 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: