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

libreoffice-qt: fix build

Browse source 
Broke in 408ece7d3d because the
`disallowedRequisites` fails here since the QT variant apparently needs
to reference a few dev outputs[1].

I won't look into the details of that now, so the easiest way to unbreak
is to skip the check for the QT variant. It should be kept for non-QT
though to make sure that a change similar to the BUILDCONFIG thing isn't
missed again by us.

[1] https://github.com/NixOS/nixpkgs/pull/245361#issuecomment-1651389735

    error: output '/nix/store/2y0czyy26gcsqhmcvd2mlqa35f0gcl4l-libreoffice-7.5.4.1' is not allowed to refer to the following paths:
             /nix/store/0hmvklj0mbhrn8flwbcwivvkv45limhg-freetype-2.13.0-dev
             /nix/store/0rnx7rc87hwkbrhsys7mgwq4jw6pz7ma-zlib-1.2.13-dev
             [...]
This commit is contained in:
Maximilian Bosch 2023-07-26 12:54:36 +02:00
parent 3ea8f62a71
commit 9e0bf8497f
No known key found for this signature in database
GPG key ID: 9A6EEA275CA5BE0A
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/office/libreoffice/default.nix
View file

@ -226,9 +226,10 @@ in
# in the binary causing the closure size to blow up because of many unnecessary # in the binary causing the closure size to blow up because of many unnecessary
# dependencies to dev outputs. This behavior was patched away in nixpkgs # dependencies to dev outputs. This behavior was patched away in nixpkgs
# (see above), make sure these don't leak again by accident. # (see above), make sure these don't leak again by accident.
disallowedRequisites = lib.concatMap disallowedRequisites = lib.optionals (!kdeIntegration)
(x: lib.optional (x?dev) x.dev) (lib.concatMap
buildInputs; (x: lib.optional (x?dev) x.dev)
buildInputs);
### QT/KDE ### QT/KDE
# #